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

32 files changed, 109 insertions, 197 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 4c9bc9daa..fb4a1f34c 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -17,12 +17,10 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
 USE_GNOME=	libidl ltverhack referencehack
-USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/anjuta-extras3/Makefile b/devel/anjuta-extras3/Makefile
index b40d1dca3..3408b6d5f 100644
--- a/devel/anjuta-extras3/Makefile
+++ b/devel/anjuta-extras3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	anjuta-extras
-# Date created:				8 May 2009
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	anjuta-extras
 PORTVERSION=	3.4.0
@@ -17,7 +13,7 @@ COMMENT=	Extra anjuta 3 plugins
 LIB_DEPENDS=	anjuta-3:${PORTSDIR}/devel/anjuta3
 		
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/devel/anjuta3/Makefile b/devel/anjuta3/Makefile
index 310907e1b..6805a4a60 100644
--- a/devel/anjuta3/Makefile
+++ b/devel/anjuta3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/anjuta3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	anjuta
 PORTVERSION=	3.4.3
@@ -28,9 +28,8 @@ CONFLICTS=	anjuta-2.[0-9]*
 
 LATEST_LINK=	anjuta3
 USE_XZ=		yes
-USES=		bison pathfix
+USES=		bison pathfix gettext pkgconfig shared-mime-info
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
@@ -120,7 +119,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		${WRKSRC}/libanjuta/anjuta-utils.c
 
-post-install:
-	@update-mime-database ${PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/devel/anjuta3/pkg-plist b/devel/anjuta3/pkg-plist
index 9d28c69d5..384105e5c 100644
--- a/devel/anjuta3/pkg-plist
+++ b/devel/anjuta3/pkg-plist
@@ -2252,5 +2252,3 @@ share/pixmaps/anjuta/anjuta-preferences-general-48.png
 @dirrm include/libanjuta-3.0/libanjuta/interfaces
 @dirrm include/libanjuta-3.0/libanjuta
 @dirrm include/libanjuta-3.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index aaebf695a..13ace6d7c 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -12,9 +12,8 @@ COMMENT=	A couple of command line utilities for working with desktop entries
 
 USE_GNOME=	glib20
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lispdir
 CONFIGURE_ENV=	EMACS="no"
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 365f22ba9..02d65ced0 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	devhelp
-# Date created:				29 May 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/devhelp/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
@@ -16,16 +13,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2
 
-LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique
 
 CONFLICTS=	devhelp-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_XORG=	x11
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui libwnck
+USE_GNOME=	intlhack gnomeprefix libgnomeui libwnck
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -34,11 +31,12 @@ GCONF_SCHEMAS=	devhelp.schemas
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
-OPTIONS=	GEDIT "Enable GEdit plug-in support" off
+OPTIONS_DEFINE=	GEDIT
+GEDIT_DESC=	GEdit plug-in support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GEDIT)
+.if ${PORT_OPTIONS:MGEDIT}
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
@@ -47,11 +45,11 @@ PLIST_SUB+=	GEDIT="@comment "
 .endif
 
 post-patch:
-.if defined(WITHOUT_GEDIT)
+.if ! ${PORT_OPTIONS:MGEDIT}
 	@${REINPLACE_CMD} -e 's|gedit-plugin||' \
 		${WRKSRC}/misc/Makefile.in
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_SINGLE_INCLUDES||g' \
 		${WRKSRC}/src/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/devhelp3/Makefile b/devel/devhelp3/Makefile
index 54d48d5b3..7a3c8b013 100644
--- a/devel/devhelp3/Makefile
+++ b/devel/devhelp3/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	devhelp
-# Date created:				29 May 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/devhelp3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	devhelp
 PORTVERSION=	3.4.1
@@ -14,16 +11,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 3
 
-LIB_DEPENDS=	webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3
+LIB_DEPENDS=	webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3
 
 CONFLICTS=	devhelp-2.[0-9]*
 
 LATEST_LINK=	devhelp3
 USE_XZ=		yes
 USE_XORG=	x11
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 gconf2
+USE_GNOME=	intlhack gnomeprefix gtk30 gconf2
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 49155aa97..e580327e4 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -13,10 +13,8 @@ COMMENT?=	A file and directory monitoring system
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		gettext pathfix pkgconfig
 USE_GNOME?=	glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--without-python
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index aa0977e98..fbd07c154 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/gconf2/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gconf2
 PORTVERSION=	3.2.6
@@ -25,8 +25,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
+USES=		gettext pathfix pkgconfig
+USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
@@ -40,8 +40,6 @@ MAN1=		gconftool-2.1 gsettings-data-convert.1 \
 
 OPTIONS_DEFINE=	LDAP
 
-#OPTIONS=	LDAP "Enable LDAP support" off
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 54cf59824..4fd33eadb 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	glade3
-# Date created:		Sun May 22 17:22:53 CEST 2005
-# Whom:			Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/glade/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	glade
 PORTVERSION=	3.12.2
@@ -22,9 +18,9 @@ CONFLICTS=	glade3-3.*
 INSTALLS_ICONS=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk30 gnomeprefix gnomehack ltverhack gnomedocutils
+USE_GNOME=	gtk30 gnomeprefix ltverhack gnomedocutils
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig desktop-file-utils
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
@@ -33,11 +29,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/gladeui-2
 
-OPTIONS=	PYTHON "Enable python widget support" on
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_DEFAULT=PYTHON
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 USE_GNOME+=	pygobject3
 PLIST_SUB+=	PYTHON:=""
@@ -47,7 +44,4 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON:="@comment "
 .endif
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 2f727f99e..9e1c15635 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	glade3
-# Date created:		Sun May 22 17:22:53 CEST 2005
-# Whom:			Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/glade3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	glade3
 PORTVERSION=	3.8.2
@@ -21,10 +17,9 @@ LATEST_LINK=	glade3
 INSTALLS_ICONS=	yes
 USE_XZ=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libxml2 gnomeprefix gnomehack \
-		gnomedocutils desktopfileutils ltverhack:10
+USE_GNOME=	gtk20 libxml2 gnomeprefix gnomedocutils ltverhack:10
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils pkgconfig
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
@@ -33,12 +28,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/gladeui
 
-OPTIONS=	GNOME "Enable GNOME UI widget support" off \
-		PYTHON "Enable python widget support" on
+OPTIONS_DEFINE=	GNOME PYTHON
+OPTIONS_DEFAULT=PYTHON
+GNOME_DESC=	GNOME UI widget support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	libgnomeui
 CONFIGURE_ARGS+=--enable-gnome
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
@@ -48,7 +44,7 @@ CONFIGURE_ARGS+=--disable-gnome
 PLIST_SUB+=	GNOME:="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 USE_GNOME+=	pygtk2
 PLIST_SUB+=	PYTHON:=""
@@ -60,6 +56,5 @@ PLIST_SUB+=	PYTHON:="@comment "
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/glade3/bindings
-	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index f38e05568..c60fa5b37 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -622,8 +622,6 @@ share/omf/glade3/glade3-zh_CN.omf
 @dirrm lib/glade3
 @dirrm include/libgladeui-1.0/gladeui
 @dirrm include/libgladeui-1.0
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 1e00df2ff..96bb3183f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -23,12 +23,9 @@ PORTSCOUT=	limitw:1,even
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		ffi:${PORTSDIR}/devel/libffi
 
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USES=		gettext iconv pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
-USES=		pathfix
 USE_GNOME=	ltverhack
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index a2eb4fe6c..7fa33e2c4 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -22,10 +22,8 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		gettext pathfix pkgconfig
 USE_GNOME=	glib20 ltverhack libsigc++20
-USE_PKGCONFIG=	build
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 7f88e10bb..7366af636 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -15,14 +15,12 @@ COMMENT=	Generate interface introspection data for GObject libraries
 BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
-USES=		bison pathfix
+USES=		bison pathfix pkgconfig gettext
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehier glib20 ltverhack
-USE_PKGCONFIG=	build
 USE_PYTHON=	-2.7
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index aed6e2d18..b71f928c4 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/goffice/Makefile 18385 2013-04-22 12:56:25Z kwm $
 
 PORTNAME=	goffice
 PORTVERSION=	0.10.1
@@ -15,14 +15,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 libgsf ltverhack
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-lasem=no --with-config-backend=gsettings
+
 PLIST_SUB=	VERSION=${PORTVERSION} SHORT_VER=${SHORT_VER}
 SHORT_VER=0.10
 
diff --git a/devel/goffice08/Makefile b/devel/goffice08/Makefile
index 4bf0d68a6..761ab229e 100644
--- a/devel/goffice08/Makefile
+++ b/devel/goffice08/Makefile
@@ -19,12 +19,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
-USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix intlhack gtk20 libgsf ltverhack
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		SHORT_VER=0.8
 
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 72537feca..17dc5b0a7 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gsettings-desktop-schemas
-# Date created:				14 Aug 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gsettings-desktop-schemas
 PORTVERSION=	3.4.2
@@ -22,11 +18,10 @@ RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
-USE_GNOME=	gnomehack intltool glib20
-USE_PKGCONFIG=	build
+USE_GNOME=	intltool glib20
 GNU_CONFIGURE=	yes
 
 GLIB_SCHEMAS=	org.gnome.desktop.a11y.applications.gschema.xml \
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 12e643ae2..d75596378 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gtranslator
-# Date created:				16 September 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/gtranslator/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gtranslator
 PORTVERSION=	2.91.5
@@ -26,10 +22,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 libgda4 \
-		gtksourceview3 libxml2
+USE_GNOME=	intlhack gnomeprefix gtk30 libgda4 gtksourceview3 libxml2
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
@@ -56,6 +51,7 @@ DICT_DESC=	Build dictionary plugin
 .if ${PORT_OPTIONS:MDICT}
 BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
 LIB_DEPENDS+=	gdict-1.0:${PORTSDIR}/deskutils/gnome-dictionary
+RUN_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
 GLIB_SCHEMAS+=	org.gnome.gtranslator.plugins.dictionary.gschema.xml
 CONFIGURE_ARGS+=--with-dictionary
 PLIST_SUB+=	DICT=""
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 9cf721ace..a72fd18a8 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -18,14 +18,12 @@ USE_BZIP2=	yes
 
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
-USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		bison gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GNOME=	intlhack libxml2 orbit2 referencehack
-USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 28dc4c005..c829acd68 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgdata
-# Date created:				9 May 2009
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/libgdata/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgdata
 PORTVERSION=	0.12.0
@@ -24,12 +20,11 @@ CONFLICTS=	libgdata-0.6.*
 
 USE_XZ=		yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intltool ltverhack glib20
-USE_PKGCONFIG=	build
+USE_GNOME=	gnomeprefix intltool ltverhack glib20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile
index 5fd7b3104..33c6f391c 100644
--- a/devel/libgdata06/Makefile
+++ b/devel/libgdata06/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgdata
-# Date created:				9 May 2009
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/libgdata06/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libgdata
 PORTVERSION=	0.6.6
@@ -16,20 +12,20 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GLib based implimentation of the GData protocol
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
+LIB_DEPENDS=	soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome
 
 CONFLICTS=	libgdata-0.10.*
 
 LATEST_LINK=	libgdata06
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack intltool ltverhack glib20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	intltool ltverhack glib20
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc"
 
 .include <bsd.port.mk>
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index f3d899f97..ce63c4605 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -15,10 +15,9 @@ BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_XZ=		yes
 USE_GMAKE=	yes
+USES=		gettext pathfix pkgconfig
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
-USES=		pathfix
 USE_GNOME=	gnomeprefix glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 3ee6e3cf1..baad2850b 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libgtop/Makefile 17279 2013-04-06 09:33:19Z kwm $
 
 PORTNAME=	libgtop
 PORTVERSION=	2.28.4
@@ -14,9 +14,8 @@ COMMENT=	GNOME 2 top library
 USE_XZ=		yes
 USE_PERL5_BUILD=yes
 USE_XORG=	xau
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USES=		pathfix
 USE_GNOME=	gnomeprefix glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 9f5626ab1..f4c4e151b 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libnotify
-# Date created:				2005-08-06
-# Whom:					Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/libnotify/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libnotify
 PORTVERSION=	0.7.5
@@ -21,8 +17,8 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack intlhack glib20 gtk20 ltverhack
-USE_GETTEXT=	yes
+USE_GNOME=	intlhack glib20 gtk20 ltverhack
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index a27359870..be1cb96cd 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	liboobs
-# Date created:		2006-06-06
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/liboobs/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	liboobs
 PORTVERSION=	3.0.0
@@ -16,14 +12,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Wrapping library to the System Tools Backends
 
 BUILD_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-    		hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+    		hal:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack glib20
+USES=		pathfix
+USE_GNOME=	gnomeprefix glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-hal
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 5dddac310..6aa79a239 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -17,10 +17,9 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 USE_XZ=		yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
+USES=		pathfix gettext pkgconfig
 USE_GNOME=	gtk30 ltverhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 5a6946dc1..8898bbc10 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,8 +20,7 @@ USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomehier glib20 libxml2 ltverhack referencehack intltool
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index 1fb06c0cc..703a8d86d 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   mm-common
-# Date Created:			27 Aug 2009
-# Whom:				Koop Mast<kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/mm-common/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	mm-common
 PORTVERSION=	0.9.5
@@ -14,9 +10,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common build infrastructure for the GNOME C++ binding libraries
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_GNOME=	gnomehack
+USES=		pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 59c294fd5..3e4249d23 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   py-dbus
-# Date Created:			25 July 2004
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	dbus
 PORTVERSION=	1.1.1
@@ -18,8 +14,7 @@ COMMENT=	Python bindings for the D-BUS messaging system
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack
+USES=		gettext pathfix pkgconfig
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
@@ -30,9 +25,9 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/bin/rst2html) && !defined(NOPORTDOCS)
+.if exists(${LOCALBASE}/bin/rst2html) && ${PORT_OPTIONS:MDOCS}
 PLIST_SUB+=	HTML=""
 .else
 CONFIGURE_ARGS+=--disable-html-docs
@@ -40,16 +35,16 @@ PLIST_SUB+=	HTML="@comment "
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
 		s|PYTHON install-nodist_docDATA|PYTHON|g' \
 			${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index b9716bc3b..e2766f869 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	regexxer
-# Date created:				15 February 2003
-# Whom:					Rui Lopes <rui@ruilopes.com>
-#
+# Created by: Rui Lopes <rui@ruilopes.com>
 # $FreeBSD$
-#
 
 PORTNAME=	regexxer
 PORTVERSION=	0.10
@@ -13,14 +9,11 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	An interactive tool for performing search and replace operations
 
-LIB_DEPENDS=	gtkmm-3.0.1:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		gtksourceviewmm-3.0.0:${PORTSDIR}/x11-toolkits/gtksourceviewmm3
-
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix intltool intlhack
+USE_GNOME=	gnomeprefix intltool intlhack gtkmm30 gtksourceviewmm3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index e8ad27c18..3e8037921 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/seed3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
 # To do that, just replace imports.searchPaths with "." and ".." elements.
 
@@ -25,8 +25,8 @@ CONFLICTS=	seed-2.[0-9]*
 LATEST_LINK=	seed3
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gtk30 intltool libxml2
+USES=		gettext pathfix pkgconfig
+USE_GNOME=	gtk30 intltool libxml2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
@@ -38,7 +38,7 @@ DATADIR=	share/seed-gtk3
 
 MAN1=		seed.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
@@ -52,7 +52,7 @@ post-patch:
 #	@${REINPLACE_CMD} -e 's|examples||g' \
 #		${WRKSRC}/Makefile.in
 #.endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
 		${WRKSRC}/Makefile.in
 .endif
@@ -66,4 +66,4 @@ pre-build:
 post-build:
 	${CP} ${WRKSRC}/extensions/Seed.js.sav ${WRKSRC}/extensions/Seed.js
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>