Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18393 df743ca5-7f9a-e211-a948-0013205c9059

27 files changed, 134 insertions, 233 deletions

diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index e9774746f..16033a75c 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -37,10 +37,9 @@ GH_COMMIT=	941456a
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Cinnamon-${GH_COMMIT}
 
 USE_XORG=	x11 xfixes sm
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool autoconf automake
-USES=		pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3 pygnome2
 USE_GSTREAMER=	theora vp8 ogg
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index ace0a2029..8da193150 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gdm2
-# Date created:        20 May 2002
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gdm/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gdm
 PORTVERSION=	2.30.7
@@ -18,12 +14,12 @@ COMMENT=	GNOME 2 version of xdm display manager
 
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
-		polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
+LIB_DEPENDS=	ck-connector:${PORTSDIR}/sysutils/consolekit \
+		polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
     		execinfo:${PORTSDIR}/devel/libexecinfo \
-		upower-glib.1:${PORTSDIR}/sysutils/upower \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+		upower-glib:${PORTSDIR}/sysutils/upower \
+		xklavier:${PORTSDIR}/x11/libxklavier \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		gnome-session:${PORTSDIR}/x11/gnome-session \
@@ -35,14 +31,14 @@ USERS=		gdm
 GROUPS=		gdm
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier gconf2 librsvg2 \
+USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
@@ -63,12 +59,12 @@ GNOME_LOCALSTATEDIR=	/var
 OPTIONS=	IPV6 "Enable IPv6 support" off \
 		KEYRING "Enable GnomeKeyring/PAM integration" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITHOUT_KEYRING)
 SUB_LIST+=	PAM_KEYRING=\#
 .else
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 SUB_LIST+=	PAM_KEYRING=
 .endif
 
@@ -108,4 +104,4 @@ post-install:
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index cc339ad2e..c7aeb320a 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gdm2
-# Date created:        20 May 2002
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gdm3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gdm
 PORTVERSION=	3.4.1
@@ -19,16 +15,15 @@ COMMENT=	GNOME 3 version of xdm display manager
 BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
 		nss-config:${PORTSDIR}/security/nss \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
-		dconf.0:${PORTSDIR}/devel/dconf \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
+LIB_DEPENDS=	ck-connector:${PORTSDIR}/sysutils/consolekit \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
     		execinfo:${PORTSDIR}/devel/libexecinfo \
-		upower-glib.1:${PORTSDIR}/sysutils/upower \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		accountsservice.0:${PORTSDIR}/sysutils/accountsservice \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
+		upower-glib:${PORTSDIR}/sysutils/upower \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		accountsservice:${PORTSDIR}/sysutils/accountsservice \
+		xklavier:${PORTSDIR}/x11/libxklavier \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		nss-config:${PORTSDIR}/security/nss \
@@ -44,7 +39,7 @@ GROUPS=		gdm
 
 LATEST_LINK=	gdm3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_OMF=	yes
@@ -52,7 +47,7 @@ INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier librsvg2 gnomeprefix gnomepanel3
+USE_GNOME=	intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
@@ -60,8 +55,8 @@ CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
 		--enable-authentication-scheme=pam \
 		--with-console-kit \
 		--with-systemd=no
-CPPFLAGS=	-I${LOCALBASE}/include -DHAS_SA_LEN
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAS_SA_LEN
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGLIBS=	-lm -lexecinfo
 CONFIGURE_ENV=	LIBS="${CONFIGLIBS}" \
 		GTKDOC="false"
@@ -129,11 +124,9 @@ post-install:
 	@dconf update
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 # logwtmp lives here.
 .if ${OSVERSION} < 900000
 CONFIGLIBS+=	-lutil
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f28eb1cc9..7595faf7e 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-desktop/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
@@ -16,13 +16,12 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 
 USE_XORG=	xpm
-USES=		bison pathfix
+USES=		bison gettext pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		ltverhack referencehack
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index 2818c131d..87d4e1f46 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-desktop3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	3.4.2
@@ -26,9 +26,8 @@ LATEST_LINK=	gnome-desktop3
 USE_XORG=	x11 xrandr xext
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gtk30 \
 		ltverhack referencehack
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		bison pathfix
+USES=		bison gettext pathfix
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index f0daac6cd..50cc69db5 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-menus/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.30.5
@@ -16,12 +16,10 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 CONFLICTS=	gnome-menus-3.[0-9]*
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix
 USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
index edf8759bd..c3d021e7c 100644
--- a/x11/gnome-menus3/Makefile
+++ b/x11/gnome-menus3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-menus3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	3.4.2
@@ -16,12 +16,10 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 CONFLICTS=	gnome-menus-2.[0-9]*
 
 LATEST_LINK=	gnome-menus3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		pathfix
 USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 53dedd847..7f0305479 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomepanel
-# Date created:				27 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-panel/Makefile 18392 2013-04-26 11:23:16Z mezz $
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
@@ -21,18 +17,18 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
 
 CONFLICTS=	gnome-panel-3.[0-9]*
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_XORG=	ice sm x11 xau xrandr
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
+USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
 WANT_GNOME=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile
index bbef9d056..ce2a1dbcb 100644
--- a/x11/gnome-panel3/Makefile
+++ b/x11/gnome-panel3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomepanel
-# Date created:				27 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-panel3/Makefile 18392 2013-04-26 11:23:16Z mezz $
 
 PORTNAME=	gnome-panel
 PORTVERSION=	3.4.2.1
@@ -21,20 +17,20 @@ USE_XZ=		yes
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	gweather-3.0:${PORTSDIR}/net/libgweather3 \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 
 CONFLICTS=	gnome-panel-2.[0-9]*
 
 LATEST_LINK=	gnome-panel3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XORG=	ice sm x11 xau xrandr
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop3 librsvg2 libwnck3 \
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 librsvg2 libwnck3 \
 		gnomemenus3 gnomedocutils ltverhack referencehack
 WANT_GNOME=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 16e28c4cc..73b8ac6e1 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-screensaver
-# Date created:		09 June 2005
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-screensaver/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.30.2
@@ -16,18 +12,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 CONFLICTS=	gnome-screensaver-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
-		gnomedesktop
+USE_GNOME=	gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index 22570cf3e..03b3e3141 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-screensaver
-# Date created:		09 June 2005
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-screensaver3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	3.4.4
@@ -27,10 +23,10 @@ CONFLICTS=	gnome-screensaver-2.[0-9]*
 LATEST_LINK=	gnome-screensaver3
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomekbd3 gnomedesktop3
+USE_GNOME=	gnomeprefix intlhack libgnomekbd3 gnomedesktop3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d \
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f6e751c92..b3d0841e4 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomesession
-# Date created:				08 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-session/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.32.1
@@ -19,20 +15,20 @@ COMMENT=	Session component for the GNOME 2 desktop
 CONFLICTS=	gnome-session-3.[0-9]*
 
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		notify.4:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
+		notify:${PORTSDIR}/devel/libnotify \
 		execinfo:${PORTSDIR}/devel/libexecinfo \
-		upower-glib.1:${PORTSDIR}/sysutils/upower
+		upower-glib:${PORTSDIR}/sysutils/upower
 RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
     		${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	ice sm xau xrandr
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
+USE_GNOME=	gnomeprefix intlhack gconf2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
diff --git a/x11/gnome-session3/Makefile b/x11/gnome-session3/Makefile
index 95eaedd6b..9f9c9cb1c 100644
--- a/x11/gnome-session3/Makefile
+++ b/x11/gnome-session3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomesession
-# Date created:				08 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-session3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-session
 PORTVERSION=	3.4.2.1
@@ -26,11 +22,11 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consoleki
 
 LATEST_LINK=	gnome-session3
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 intltool gtk30 librsvg2
+USE_GNOME=	gnomeprefix intlhack gconf2 intltool gtk30 librsvg2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index a5d7d68b1..5483d3737 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnome-shell-extensions
-# Date created:        21 May 2011
-# Whom:                Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	gnome-shell-extensions
 PORTVERSION=	3.2.0
@@ -15,12 +11,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME desktop shell extensions
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 RUN_DEPENDS=	gnome-shell>=3.2.0:${PORTSDIR}/x11/gnome-shell
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
-USE_GNOME=	intltool gnomehack glib20 gnomedesktop3
+USES=		gettext pathfix
+USE_GNOME=	intltool glib20 gnomedesktop3
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index c5043be67..5392299e0 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnome-shell
-# Date created:        14 Aug 2009
-# Whom:                Pawel Worach <pawel.worach@gmail.com>
-#
+# Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-shell/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-shell
 PORTVERSION=	3.4.2
@@ -17,28 +13,28 @@ COMMENT=	Next generation GNOME desktop shell
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		gcr>=3.4.1:${PORTSDIR}/security/gcr
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		caribou.0:${PORTSDIR}/accessibility/caribou \
-		mutter.0:${PORTSDIR}/x11-wm/mutter \
+LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
+		caribou:${PORTSDIR}/accessibility/caribou \
+		mutter:${PORTSDIR}/x11-wm/mutter \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
 		gcr:${PORTSDIR}/security/gcr \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \
-		folks.25:${PORTSDIR}/net-im/folks \
-		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		croco-0.6.3:${PORTSDIR}/textproc/libcroco \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
+		folks:${PORTSDIR}/net-im/folks \
+		pulse:${PORTSDIR}/audio/pulseaudio \
+		croco-0.6:${PORTSDIR}/textproc/libcroco \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		clutter-1.0:${PORTSDIR}/graphics/clutter \
-		gjs.0:${PORTSDIR}/lang/gjs
+		gjs:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 USE_XZ=		yes
 USE_XORG=	x11 xfixes sm
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gnomemenus3 \
+USE_GNOME=	gnomeprefix intlhack gtk30 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3 ltverhack
 USE_GSTREAMER=	theora vp8 ogg
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index a6071f92b..34646160d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnometerminal
-# Date created:				1 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-terminal/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.32.1
@@ -16,17 +12,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 2 Desktop
 
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS=	gnome-terminal-3.[0-9]*
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_BZIP2=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \
-		libgnome
+USE_GNOME=	gnomeprefix intlhack gconf2 vte gnomedocutils libgnome
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome-terminal3/Makefile b/x11/gnome-terminal3/Makefile
index da5579d72..231949c2e 100644
--- a/x11/gnome-terminal3/Makefile
+++ b/x11/gnome-terminal3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnometerminal
-# Date created:				1 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome-terminal3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	3.4.1.1
@@ -18,16 +14,16 @@ COMMENT=	Terminal component for the GNOME 3 Desktop
 CONFLICTS=	gnome-terminal-2.[0-9]*
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 LATEST_LINK=	gnome-terminal3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm ice
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 vte3 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gconf2 vte3 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 987f63b2e..0ecf1d37b 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome2-lite
-# Date created:		30 November 2003
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome2-lite/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	x11 gnome
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 8b6ab47cf..89157d704 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome2
-# Date created:		21 May 2002
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome2/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome2
 PORTVERSION=	2.32.1
diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile
index ff22926ec..fc4b7a307 100644
--- a/x11/gnome3-lite/Makefile
+++ b/x11/gnome3-lite/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome2-lite
-# Date created:		30 November 2003
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome3-lite/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTREVISION=	0
 CATEGORIES=	x11 gnome
@@ -19,6 +15,3 @@ DESCR=		${.CURDIR}/pkg-descr
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
 .include "${MASTERDIR}/Makefile"
-
-
-
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index daea92775..c36fefacc 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome2
-# Date created:		21 May 2002
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/gnome3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome3
 PORTVERSION=	3.4.0
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 18347a851..0e54f60eb 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnomekbd
-# Date created:		2006-11-07
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/libgnomekbd/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.32.0
@@ -16,15 +12,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyboard shared library
 
-LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier:${PORTSDIR}/x11/libxklavier
 
 CONFLICTS=	libgnomekbd-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix gnomehack ltverhack gconf2
+USE_GNOME=	gnomeprefix ltverhack gconf2
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -32,8 +28,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas
 
-#post-patch:
-#	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-#	    	's|-Werror||g'
-
 .include <bsd.port.mk>
diff --git a/x11/libgnomekbd3/Makefile b/x11/libgnomekbd3/Makefile
index 8ec7d5d6a..6a502f59c 100644
--- a/x11/libgnomekbd3/Makefile
+++ b/x11/libgnomekbd3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnomekbd
-# Date created:		2006-11-07
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/libgnomekbd3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	3.4.0.2
@@ -16,18 +12,18 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyboard shared library
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier:${PORTSDIR}/x11/libxklavier
 
 LATEST_LINK=	libgnomekbd3
 
 CONFLICTS=	libgnomekbd-2.[0-9]*
 
 USE_XZ=		yes
-USE_GNOME=	gnomeprefix gnomehack ltverhack intltool gtk30
+USE_GNOME=	gnomeprefix ltverhack intltool gtk30
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 3bd2f11af..9d19f1762 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libxklavier
-# Date created:				31 May 2002
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/libxklavier/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libxklavier
 PORTVERSION=	5.2.1
@@ -23,7 +19,8 @@ RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
 USE_XORG=	x11 xkbfile
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libxml2 glib20 ltverhack:12
+USES=		pathfix
+USE_GNOME=	libxml2 glib20 ltverhack:12
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/yelp3/Makefile b/x11/yelp3/Makefile
index 32059664e..3c931ef05 100644
--- a/x11/yelp3/Makefile
+++ b/x11/yelp3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	yelp
-# Date created:				18 May 2002
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/x11/yelp3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	yelp
 PORTVERSION=	3.4.2
@@ -26,11 +22,11 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/yelp-xsl.pc:${PORTSDIR}/textproc/yel
 CONFLICTS=	yelp-2.[0-9]*
 
 LATEST_LINK=	yelp3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_XORG=	x11 ice
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 libxslt libxml2
+USE_GNOME=	gnomeprefix intlhack gtk30 libxslt libxml2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 9ab4e2d62..8f666d3ea 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -16,15 +16,14 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 gnomedocutils intlhack
+USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LIBS="-lintl ${PTHREAD_LIBS}"
 
 MAN1=		zenity.1
 
@@ -35,8 +34,8 @@ OPTIONS_DEFAULT=NOTIFY
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=		notify:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-libnotify
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile
index b1e9f46ce..d5a59867a 100644
--- a/x11/zenity3/Makefile
+++ b/x11/zenity3/Makefile
@@ -16,10 +16,10 @@ LICENSE=	LGPL20
 LATEST_LINK=	zenity3
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk30 gnomedocutils intlhack
+USE_GNOME=	gnomeprefix gtk30 gnomedocutils intlhack
 USE_XORG=	x11
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=NOTIFY
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-libnotify
 .else
 CONFIGURE_ARGS+=	--disable-libnotify