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

8 files changed, 38 insertions, 72 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index a27f900dc..a9ce9c9d6 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit-plugins
-# Date created:				19 September 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/gedit-plugins/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
@@ -26,9 +22,9 @@ CONFLICTS=	gedit-plugins-3.[0-9]*
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gnomeprefix intlhack gnomevfs2
+USE_GNOME=	gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -36,16 +32,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas \
 		gedit-drawspaces.schemas
 
-OPTIONS=	PYTHON "Build plugins that depend on python" off
+OPTIONS_DEFINE=	PYTHON
+PYTHON_DESC=	Build python plugins
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 WITH_GNOME=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON)
+.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=	pygtksourceview
diff --git a/editors/gedit-plugins3/Makefile b/editors/gedit-plugins3/Makefile
index b4b416a4f..be4bb7f33 100644
--- a/editors/gedit-plugins3/Makefile
+++ b/editors/gedit-plugins3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit-plugins
-# Date created:				19 September 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/gedit-plugins3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	3.4.0
@@ -16,7 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for GEdit 3
 
 BUILD_DEPENDS=	gedit>=${GEDITVER}:${PORTSDIR}/editors/gedit3
-LIB_DEPENDS=	peas-1.0.0:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS=	peas-1.0:${PORTSDIR}/devel/libpeas
 RUN_DEPENDS=	gedit>=${GEDITVER}:${PORTSDIR}/editors/gedit3
 
 CONFLICTS=	gedit-plugins-2.[0-9]*
@@ -26,9 +22,9 @@ LATEST_LINK=	gedit-plugins3
 USE_LDCONFIG=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gnomeprefix intlhack gtk30 gtksourceview3
+USE_GNOME=	gnomeprefix intlhack gtk30 gtksourceview3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 3c95490bc..3f3bf6199 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit2
-# Date created:				14 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/gedit/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
@@ -17,21 +13,21 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small but powerful text editor for GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 CONFLICTS=	gedit-3.[0-9]*
 
 USE_XORG=	sm
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
-		desktopfileutils gnomedocutils ltasneededhack
+USE_GNOME=	gnomeprefix intlhack gconf2 gtksourceview2 \
+		gnomedocutils ltasneededhack
 WANT_GNOME=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -45,7 +41,7 @@ GCONF_SCHEMAS=	gedit.schemas gedit-file-browser.schemas
 WITH_GNOME=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${HAVE_GNOME:Mpygtksourceview}!=""
 USE_PYTHON=	yes
@@ -64,7 +60,4 @@ PLIST_SUB+=	PYTHON="@comment "
 #	${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff}
 #.endfor
 
-post-install:
-	@-update-desktop-database
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 0823a841a..820f57741 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -635,8 +635,6 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrmtry lib/gedit-2
 @dirrm include/gedit-%%VERSION%%/gedit
 @dirrm include/gedit-%%VERSION%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile
index ec324e634..b7806e5f9 100644
--- a/editors/gedit3/Makefile
+++ b/editors/gedit3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit2
-# Date created:				14 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/gedit3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gedit
 PORTVERSION=	3.4.2
@@ -18,9 +14,9 @@ COMMENT=	A small but powerful text editor for GNOME 3 Desktop Environment
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
-		peas-gtk-1.0.0:${PORTSDIR}/devel/libpeas \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		peas-gtk-1.0:${PORTSDIR}/devel/libpeas \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
@@ -29,13 +25,13 @@ CONFLICTS=	gedit-2.[0-9]*
 LATEST_LINK=	gedit3
 USE_XORG=	sm
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils pkgconfig
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gtksourceview3 libxml2 \
-		desktopfileutils gnomedocutils pygobject3
+USE_GNOME=	gnomeprefix intlhack gtksourceview3 libxml2 \
+		gnomedocutils pygobject3
 CONFIGURE_ARGS=	--disable-updater
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -51,7 +47,4 @@ GLIB_SCHEMAS=	org.gnome.gedit.enums.xml \
 		org.gnome.gedit.plugins.time.enums.xml \
 		org.gnome.gedit.plugins.time.gschema.xml
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/editors/gedit3/pkg-plist b/editors/gedit3/pkg-plist
index 3a5d10832..eeb3fc96c 100644
--- a/editors/gedit3/pkg-plist
+++ b/editors/gedit3/pkg-plist
@@ -2319,5 +2319,3 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrmtry lib/gedit
 @dirrm include/gedit-%%VERSION%%/gedit
 @dirrm include/gedit-%%VERSION%%
-@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/editors/ghex/Makefile b/editors/ghex/Makefile
index 831f77377..6fa973c28 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	ghex2
-# Date created:				15 September 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/ghex/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	ghex
 PORTVERSION=	2.24.0
@@ -20,9 +16,8 @@ CONFLICT=	ghex-3.\*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
-		gnomedocutils
-USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui gnomedocutils
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/editors/ghex3/Makefile b/editors/ghex3/Makefile
index a06ea3bda..4c7d6da28 100644
--- a/editors/ghex3/Makefile
+++ b/editors/ghex3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	ghex2
-# Date created:				15 September 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/editors/ghex3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	ghex
 PORTVERSION=	3.4.1
@@ -19,9 +15,9 @@ CONFLICT=	ghex-2.\*
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gnomedocutils
 INSTALLS_OMF=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes