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

14 files changed, 57 insertions, 103 deletions

diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 0d6069347..341b55fee 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/baobab/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	baobab
 PORTVERSION=	3.4.1
@@ -21,9 +17,9 @@ LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libxml2 gtk30
+USE_GNOME=	gnomeprefix intlhack libxml2 gtk30
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 7688b5b76..3010e987d 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:   gnome-contacts
-# Date Created:			17 Okt 2011
-# Whom:				Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#
+#  $MCom$
 
 PORTNAME=	gnome-contacts
 PORTVERSION=	3.4.1
@@ -14,14 +11,14 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Contacts manager for gnome
 
 BUILD_DEPENDS=	vala>=0.14.0:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
+LIB_DEPENDS=	goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
 		folks.25:${PORTSDIR}/net-im/folks \
-		notify.4:${PORTSDIR}/devel/libnotify
+		notify:${PORTSDIR}/devel/libnotify
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack intlhack gtk30 gnomedesktop3 evolutiondataserver3
+USE_GNOME=	intlhack gtk30 gnomedesktop3 evolutiondataserver3
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index 660a677bc..2220711f9 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gnome-dictionary/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-dictionary
 PORTVERSION=	3.4.0
@@ -20,12 +16,12 @@ BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gtk30
+USE_GNOME=	gnomeprefix intlhack gnomedocutils gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index d2513248f..17d811400 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	gnome-font-viewer
 PORTVERSION=	3.4.0
@@ -15,16 +11,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 font viewer utility
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30
+USE_GNOME=	gnomeprefix intlhack gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index 50c58235a..170d64af6 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	gnome-screenshot
 PORTVERSION=	3.4.1
@@ -20,9 +16,9 @@ LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30
+USE_GNOME=	gnomeprefix intlhack gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index 28e388dad..e0353be62 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gnome-search-tool/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-search-tool
 PORTVERSION=	3.4.0
@@ -18,12 +14,12 @@ COMMENT=	GNOME 3 file search utilities
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile
index 634bf93ab..f8c25fa66 100644
--- a/deskutils/gnome-system-log/Makefile
+++ b/deskutils/gnome-system-log/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gnome-system-log/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-system-log
 PORTVERSION=	3.4.1
@@ -18,11 +14,11 @@ COMMENT=	GNOME 3 system log viewer
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
index 2b744ade5..e391c7319 100644
--- a/deskutils/gnome-tweak-tool/Makefile
+++ b/deskutils/gnome-tweak-tool/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/deskutils/gnome-tweak-tool/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-tweak-tool
 PORTVERSION=	3.4.0.1
@@ -15,9 +15,9 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-deskto
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gconf2 pygobject3
+USE_GNOME=	gnomeprefix gconf2 pygobject3
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index a72c998ef..3d426d1c6 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gnome-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-utils
 PORTVERSION=	2.32.0
@@ -17,20 +13,20 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 support utilities
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
 
 CONFLICTS=	baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \
 		gnome-font-viewer-3.[0-9]* gnome-screenshot-3.[0-9]* \
 		gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
+USE_GNOME=	gnomeprefix intlhack gnomepanel ltverhack
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-maintainer-flags=no
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 047f0d7c0..363a88b91 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnote/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnote
 PORTVERSION=	0.8.3
@@ -18,9 +18,9 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
 
 USE_GMAKE=	yes
 USE_XZ=		yes
-USE_GNOME=	gnomehack gnomeprefix gtk30 intltool libxml2 libxslt \
-		ltverhack desktopfileutils gnomedocutils gtkmm30
-USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix gtk30 intltool libxml2 libxslt \
+		ltverhack gnomedocutils gtkmm30
+USES=		gettext pathfix pkgconfig desktop-file-utils
 GLIB_SCHEMAS=	org.gnome.gnote.gschema.xml
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
@@ -53,7 +53,6 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	@-update-desktop-database
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index 7d19f9d62..14de9825f 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -556,5 +556,3 @@ share/locale/zh_CN/LC_MESSAGES/gnote.mo
 @dirrmtry lib/gnote/addins/%%VERSION%%
 @dirrmtry lib/gnote/addins
 @dirrmtry lib/gnote
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index b501a5660..7992bd01a 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gucharmap
-# Date created:				02 Mar 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gucharmap/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gucharmap
 PORTVERSION=	2.32.1
@@ -16,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
-LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS=	rarian:${PORTSDIR}/textproc/rarian
 
 CONFLICTS=	gucharmap-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
+USE_GNOME=	gnomeprefix intlhack gtk20 gnomedocutils gconf2
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/gucharmap3/Makefile b/deskutils/gucharmap3/Makefile
index b8ccfa34e..81ccd0c57 100644
--- a/deskutils/gucharmap3/Makefile
+++ b/deskutils/gucharmap3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gucharmap
-# Date created:				02 Mar 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/gucharmap3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gucharmap
 PORTVERSION=	3.4.1.1
@@ -19,9 +15,9 @@ CONFLICTS=	gucharmap-2.[0-9]*
 
 LATEST_LINK=	gucharmap3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk30 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 34d81f142..9b5fcc763 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	notification-daemon
-# Date created:				2005-08-06
-# Whom:					Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/deskutils/notification-daemon/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.7.6
@@ -17,13 +13,13 @@ COMMENT=	Send small notifications to your desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack gnomeprefix intlhack gtk30
+USE_GNOME=	gnomeprefix intlhack gtk30
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes