diff options
| -rw-r--r-- | Mk/bsd.gnome.mk | 10 | ||||
| -rw-r--r-- | mail/gmime24/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/gtkglext/Makefile | 5 |
3 files changed, 10 insertions, 13 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index ca11b6f78..69fbc282f 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -496,12 +496,12 @@ gnomepanel3_GNOME_DESKTOP_VERSION=3 nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus nautilus2_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-2.0.gir -nautilus2_USE_GNOME_IMPL=librsvg2 gnomedesktop desktopfileutils gvfs +nautilus2_USE_GNOME_IMPL=librsvg2 gnomedesktop gvfs nautilus2_GNOME_DESKTOP_VERSION=2 nautilus3_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus3 nautilus3_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-3.0.gir -nautilus3_USE_GNOME_IMPL=gnomedesktop3 desktopfileutils gvfs libxml2 +nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2 nautilus3_GNOME_DESKTOP_VERSION=3 metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity @@ -520,13 +520,13 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc -gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2 +gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus libgnomekbd gnomedesktop librsvg2 gnomecontrolcenter2_GNOME_DESKTOP_VERSION=2 gnomecontrolcenter3_DETECT=${LOCALBASE}/lib/control-center-1/panels/libcolor.so gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center3 gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center3 -gnomecontrolcenter3_USE_GNOME_IMPL=gnomemenus3 desktopfileutils libgnomekbd3 gnomedesktop3 gconf2 +gnomecontrolcenter3_USE_GNOME_IMPL=gnomemenus3 libgnomekbd3 gnomedesktop3 gconf2 gnomecontrolcenter3_GNOME_DESKTOP_VERSION=3 libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2 @@ -632,7 +632,7 @@ desktopfileutils_USE_GNOME_IMPL=glib20 nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner nautiluscdburner_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc -nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils +nautiluscdburner_USE_GNOME_IMPL=nautilus2 nautiluscdburner_GNOME_DESKTOP_VERSION=2 gnomemenus_BUILD_DEPENDS= gnome-menus<=2.39.0:${PORTSDIR}/x11/gnome-menus diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile index 07a5a2a63..a4037d54e 100644 --- a/mail/gmime24/Makefile +++ b/mail/gmime24/Makefile @@ -18,11 +18,9 @@ CONFLICTS= gmime-1.0.* SLAVEDIRS= mail/gmime2-sharp DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}24 -USE_ICONV= yes USE_GMAKE= yes -USES= pathfix +USES= iconv pathfix pkgconfig USE_GNOME?= glib20 -USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XZ= yes GNU_CONFIGURE= yes @@ -39,12 +37,14 @@ LATEST_LINK?= ${PORTNAME}24 PORTDOCS= * +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/*/Makefile.in post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in docs/reference/html/* ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 9a2aa8fa9..4ba6e4f87 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -26,15 +26,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ OPTIONS_DEFINE= DOCS USE_BZIP2= yes -USE_GETTEXT= yes -USE_ICONV= yes -USE_PKGCONFIG= build +USES= gettext iconv pathfix pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL= glu -USES= pathfix USE_GNOME= gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG= yes |