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

9 files changed, 48 insertions, 69 deletions

diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index d4c1d6f42..50f4632ef 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/security/gcr/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	gcr
 PORTVERSION=	3.4.1
@@ -11,21 +11,17 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Library for bits of crypto UI and parsing
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info \
 		gtk-doc>0:${PORTSDIR}/textproc/gtk-doc
 LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		tasn1:${PORTSDIR}/security/libtasn1 \
 		p11-kit:${PORTSDIR}/security/p11-kit \
 		gcrypt:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 CONFLICTS=	gnome-keyring-3.[0-2].[0-9]* gnome-keyring-2.[0-9]*
 
 USE_XZ=		yes
-USES=		pathfix
-USE_PKGCONFIG=	build
 USE_GNOME=	gtk30 intlhack
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig shared-mime-info
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 04bc95ac5..8e4dcf73e 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/gnome-keyring/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.32.1
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 CONFLICTS=	gnome-keyring-3.[0-9]* gcr-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack intlhack
+USE_GNOME=	gnomeprefix gtk20 ltverhack intlhack
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 0fc0628f1..59706bfa4 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/gnome-keyring3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	3.4.1
@@ -26,9 +26,9 @@ CONFLICTS=	gnome-keyring-2.[0-9]*
 
 LATEST_LINK=	gnome-keyring3
 USE_XZ=		yes
-USE_GNOME=	gnomehack gnomeprefix gtk30 ltverhack intlhack
+USE_GNOME=	gnomeprefix gtk30 ltverhack intlhack
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile
index a8c43e999..6d40d1ba5 100644
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	Seahorse
-# Date created:		08 March 2000
-# Whom:			Dave McKay <dave@mu.org>
-#
+# Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/security/libcryptui/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libcryptui
 PORTVERSION=	3.4.1
@@ -16,8 +12,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+    		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
@@ -25,9 +21,9 @@ CONFLICTS=	seahorse-2.[0-9]* seahorse-3.0.[0-9]*
 
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gnomedocutils gtk30
+USE_GNOME=	intlhack gnomeprefix gnomedocutils gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
@@ -36,12 +32,12 @@ CONFIGURE_ARGS=	--enable-introspection=no
 GLIB_SCHEMAS=	org.gnome.seahorse.recipients.gschema.xml
 MAN1=		seahorse-daemon.1
 
-OPTIONS=	NOTIFY "Enable libnotify support" on
+OPTIONS_DEFINE=	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
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index 291d92515..cad67d7c8 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/libgnome-keyring/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgnome-keyring
 PORTVERSION=	3.4.1
@@ -15,9 +15,9 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_XZ=		yes
-USE_GNOME=	gnomehier gnomehack gnomeprefix ltverhack intlhack glib20
+USE_GNOME=	gnomehier gnomeprefix ltverhack intlhack glib20
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 19d04c774..0582173c7 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Library to access the secret service API
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_XZ=		yes
-USES=		pathfix
 USE_GNOME=	gnomehier glib20 libxslt:build intltool
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-introspection --disable-vala
diff --git a/security/seahorse-sharing/Makefile b/security/seahorse-sharing/Makefile
index c0138015b..d46d9d6f8 100644
--- a/security/seahorse-sharing/Makefile
+++ b/security/seahorse-sharing/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	Seahorse
-# Date created:		08 March 2000
-# Whom:			Dave McKay <dave@mu.org>
-#
+# Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	seahorse-sharing
 PORTVERSION=	3.2.1
@@ -16,16 +12,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Seahorse PGP public key sharing using DNS-SD and HKP.
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-		avahi-glib.1:${PORTSDIR}/net/avahi-app \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+		avahi-glib:${PORTSDIR}/net/avahi-app \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		seahorse>=3.2.1:${PORTSDIR}/security/seahorse3
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix
+USE_GNOME=	intlhack gnomeprefix
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index b95147c7f..7ca3ac73d 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	Seahorse
-# Date created:		08 March 2000
-# Whom:			Dave McKay <dave@mu.org>
-#
+# Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/security/seahorse/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	seahorse
 PORTVERSION=	2.32.0
@@ -18,20 +14,20 @@ COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gcr.0:${PORTSDIR}/security/gnome-keyring \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+    		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		gcr:${PORTSDIR}/security/gnome-keyring \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 
 CONFLICTS=	libcryptui-3.[0-9]* seahorse-3.[0-9]*
 
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
+USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile
index 996e4cc8f..ec47a07f2 100644
--- a/security/seahorse3/Makefile
+++ b/security/seahorse3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	Seahorse
-# Date created:		08 March 2000
-# Whom:			Dave McKay <dave@mu.org>
-#
+# Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/security/seahorse3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	seahorse
 PORTVERSION=	3.4.1
@@ -17,13 +13,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+    		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
-		cryptui.0:${PORTSDIR}/security/libcryptui \
-		gcr-3.1:${PORTSDIR}/security/gcr \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+		cryptui:${PORTSDIR}/security/libcryptui \
+		gcr-3:${PORTSDIR}/security/gcr \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 CONFLICTS=	seahorse-2.[0-9]*
@@ -32,14 +28,14 @@ LATEST_LINK=	seahorse3
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 gnomedocutils
+USE_GNOME=	intlhack gnomeprefix gtk30 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.seahorse.gschema.xml \
 		org.gnome.seahorse.manager.gschema.xml \