21 files changed, 36 insertions, 71 deletions

diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 92becef77452..abbecdaaa56c 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cal3d
-# Date created:				12 Jul 2004
-# Whom:					Stefan Walter <sw@gegenunendlich.de>
-#
+# Created by: Stefan Walter <sw@gegenunendlich.de>
 # $FreeBSD$
-#
 
 PORTNAME=	cal3d
 PORTVERSION=	20060720
@@ -20,7 +16,7 @@ COMMENT=	Skeletal based 3D character animation library written in C++ (devel)
 CONFLICTS=	cal3d-[0-9]*
 
 USE_BZIP2=	yes
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	automake autoheader libtool
 AUTOMAKE_ARGS=	--add-missing
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index e61e8e19a143..032532394edb 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cal3d
-# Date created:				12 Jul 2004
-# Whom:					Stefan Walter <sw@gegenunendlich.de>
-#
+# Created by: Stefan Walter <sw@gegenunendlich.de>
 # $FreeBSD$
-#
 
 PORTNAME=	cal3d
 PORTVERSION=	0.11.0
@@ -17,7 +13,7 @@ COMMENT=	Skeletal based 3D character animation library written in C++
 
 CONFLICTS=	cal3d-devel-[0-9]*
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake autoheader libtool
 AUTOMAKE_ARGS=	--add-missing
diff --git a/graphics/ender/Makefile b/graphics/ender/Makefile
index 2767a0f24f87..1091eda3df89 100644
--- a/graphics/ender/Makefile
+++ b/graphics/ender/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		bison pathfix
+USES=		bison pathfix pkgconfig
 USE_EFL=	eina enesim libtool_hack
-USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static
diff --git a/graphics/enesim/Makefile b/graphics/enesim/Makefile
index 4e2500772d51..19124773bed0 100644
--- a/graphics/enesim/Makefile
+++ b/graphics/enesim/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	eina libtool_hack
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static
diff --git a/graphics/etch/Makefile b/graphics/etch/Makefile
index 7960e53fb846..b2ed18999968 100644
--- a/graphics/etch/Makefile
+++ b/graphics/etch/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	eina enesim libtool_hack
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static
diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
index 115ea8957985..ee28c797ac3a 100644
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: flam3
-# Date created:  21 Mar 2010
-# Whom:          John Prather
-#
+# Created by: John Prather
 # $FreeBSD$
-#
 
 PORTNAME=	flam3
 PORTVERSION=	2.7.18
@@ -23,8 +19,7 @@ MAN1=		flam3-animate.1 flam3-genome.1 flam3-render.1 flam3-convert.1
 MANCOMPRESSED=	no
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gnomehack
+USES=		gmake pathfix pkgconfig
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 00b3b484aa12..34da78f94cec 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -15,7 +15,7 @@ COMMENT?=	Minimalistic plugin API for video effects
 
 .if !defined(BUILDING_FREI0R_METAPORT)
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 75983aa1dda8..a02f31c3240c 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -20,14 +20,14 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 CONFLICTS=	gnash-devel-[0-9]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
 WANT_GNOME=	yes
 USE_GCC=	4.2+	# triggers compiler error on gcc 3.4
 WANT_GSTREAMER=	yes
-USE_GNOME=	pkgconfig libxml2
+USE_GNOME=	libxml2
 USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
 USE_AUTOTOOLS=	libltdl
 INSTALLS_ICONS=	yes
diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile
index abb2a49442d2..8b91e8c6934c 100644
--- a/graphics/gts/Makefile
+++ b/graphics/gts/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	GNU Triangulated Surface Library
 
-USE_GNOME=	glib20 pkgconfig
+USES=		pkgconfig
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 3d81248d0c12..d975c3f5b898 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_EFL=	libtool_hack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 37d220f17476..88d9492a441c 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -13,9 +13,8 @@ COMMENT=	An easy to use C/C++ seam carving library
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	glib20 pkgconfig
-USES=		gettext
+USES=		gettext gmake pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 # Use GNU89 inline semantics
diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile
index 7100614e1373..9128024abe39 100644
--- a/graphics/libvisual04-plugins/Makefile
+++ b/graphics/libvisual04-plugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libvisual04-plugins
-# Date created:		8 February 2007
-# Whom:			Björn König <bkoenig@alpha-tierchen.de>
-#
+# Created by: Björn König <bkoenig@alpha-tierchen.de>
 # $FreeBSD$
-#
 
 PORTNAME=	libvisual
 PORTVERSION=	0.4.0
@@ -18,7 +14,7 @@ COMMENT=	Set of plugins for the libvisual framework
 
 LIB_DEPENDS=	visual-${MAJORMINOR}:${PORTSDIR}/graphics/libvisual04
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_GL=		yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index f46d106aa8fc..ea056d3e1a1e 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
-USES=		gettext
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 4a55be6e600b..6f78ab75b163 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -14,9 +14,8 @@ LIB_DEPENDS=	vips.3[0-9]:${PORTSDIR}/graphics/vips	\
 		gsl:${PORTSDIR}/math/gsl	\
 		xml2:${PORTSDIR}/textproc/libxml2
 
-USES=		bison
-USE_GMAKE=	yes
-USE_GNOME=	gnomemimedata glib20 pkgconfig gtk20
+USES=		bison gmake pkgconfig
+USE_GNOME=	gnomemimedata glib20 gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 # This port has no man-pages. It installs a number of HTML files,
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index c3ff7de9efc9..f5e7ecc192d2 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -14,11 +14,10 @@ COMMENT=	Open Source Computer Vision library from Intel
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
-USE_GNOME=	pkgconfig
 WANT_GSTREAMER=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/OpenCV-${DISTVERSION}
diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile
index a23ffca7a0bc..3a289e53630b 100644
--- a/graphics/picpuz/Makefile
+++ b/graphics/picpuz/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/ \
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Jigsaw puzzle program
 
-USE_GMAKE=	yes
-USE_GNOME=	gtk20 pkgconfig
+USES=		gmake pkgconfig
+USE_GNOME=	gtk20
 
 ALL_TARGET=	#
 #RUN_DEPENDS+=	xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils
diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile
index 7fd70f505e47..cee219e51ca5 100644
--- a/graphics/pngnq/Makefile
+++ b/graphics/pngnq/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   pngnq
-# Date created:        10 May 2009
-# Whom:                stb@lassitu.de
-#
+# Created by: stb@lassitu.de
 # $FreeBSD$
-#
 
 PORTNAME=	pngnq
 PORTVERSION=	1.1
@@ -24,7 +20,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	LIBS=-lpng
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 
 PORTDOCS=	README COPYING
 PLIST_FILES=	bin/pngcomp bin/pngnq
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 45a03f9470d8..9d0c2e42f866 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-poppler
-# Date created:		2008-04-14
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
+# Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	poppler
 PORTVERSION=	0.12.1
@@ -21,7 +17,7 @@ LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig atk pygtk2
+USES=		gmake pkgconfig
+USE_GNOME=	atk pygtk2
 
 .include <bsd.port.mk>
diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile
index 5d9080d61ca7..3428f70aa14f 100644
--- a/graphics/ruby-cairo/Makefile
+++ b/graphics/ruby-cairo/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ruby binding for Cairo
 BUILD_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=yes
 CONFIGURE_ARGS+=--ruby=${RUBY}
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 6f6b2d02f3c4..4a8b7a6d17bb 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sdl_ttf
-# Date created:				20 September 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sdl_ttf
 PORTVERSION=	2.0.11
@@ -18,8 +14,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 28e108132e7d..165232e5d59e 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -31,10 +31,9 @@ PYPRESENT!=	which python > /dev/null && echo on || echo off
 .if ${PYPRESENT} == on
 OPTIONS_DEFAULT+=	PYTHON
 .endif
-USE_GMAKE=	yes
-USES=		gettext
-USE_PERL5_BUILD=yes
-USE_GNOME=	gnomehack glib20 pkgconfig pango libxml2
+USES=		gettext gmake perl5 pkgconfig
+USE_PERL5=	build
+USE_GNOME=	gnomehack glib20 pango libxml2
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"