15 files changed, 34 insertions, 69 deletions

diff --git a/graphics/ender/Makefile b/graphics/ender/Makefile
index 82c9dba9ad74..2767a0f24f87 100644
--- a/graphics/ender/Makefile
+++ b/graphics/ender/Makefile
@@ -16,9 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_EFL=	eina enesim libtool_hack
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-static
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 665750e073e7..bc885547cdcf 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	flasm
-# Date created:		22 January 2002
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flasm
 PORTVERSION=	1.62
@@ -20,7 +16,7 @@ PLIST_FILES=	bin/flasm
 USE_ZIP=	YES
 USE_GMAKE=	YES
 USE_DOS2UNIX=	YES
-USE_BISON=	build
+USES=		bison
 NO_WRKSUBDIR=	YES
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index 8acef739d9fc..9169c529b6be 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Fractal generation program
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_QT_VER=	3
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 04f239e40a57..a6952a6586c4 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		expat:${PORTSDIR}/textproc/expat2 \
 		gd:${PORTSDIR}/${GD_PORT}
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 WANT_GNOME=	yes
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 9999e830929b..93ca7927abca 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -16,9 +16,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS
 
 USE_XZ=	yes
 USE_GETTEXT=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedocutils gconf2
+USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2
 WANT_GSTREAMER=	yes
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 002a03a63dee..57d44cee6f7d 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -15,6 +15,7 @@ COMMENT=	Physically based and unbiased rendering system
 
 LICENSE=	GPLv3
 
+ONLY_FOR_ARCHS=	i386 amd64
 BROKEN=		does not build with boost-1.48.0
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
@@ -25,7 +26,7 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 HG_NODEID=	9206b3ba7011
 
 USE_BZIP2=	yes
-USE_BISON=	build
+USES=		bison
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
 WRKSRC=		${WRKDIR}/lux-${HG_NODEID}
@@ -35,17 +36,20 @@ DESKTOP_ENTRIES="LuxRender" "${COMMENT}" \
 		"${PREFIX}/share/pixmaps/luxrender.svg" "${PORTNAME}" \
 		"Graphics;3DGraphics;" false
 
-OPTIONS=	QT4	"Build Qt4 GUI executable"		on \
-		WX	"Build wxWidgets GUI executable"	off
+OPTIONS_DEFINE=		QT4 WX
+OPTIONS_DEFAULT=	QT4
+
+QT4_DESC=		Qt4-enabled GUI executable
+WX_DESC=		wxWidgets-enabled GUI executable
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
 PLIST_FILES+=	bin/luxrender
 .endif
 
-.if defined(WITH_WX)
+.if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 PLIST_FILES+=	bin/luxrenderwx
 .endif
@@ -60,10 +64,4 @@ post-patch:
 		's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		-e 's|int_p_NULL|NULL|g' ${WRKSRC}/core/external/cimg.h
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile4: uses i386-specific options
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 4b7b197c81ef..09eb8be2f7f9 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Ming
-# Date created:		14 October 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ming
 PORTVERSION=	0.4.4
@@ -26,9 +22,8 @@ CPPFLAGS+=	-I. -I.. -I${LOCALBASE}/include
 LDFLAGS+=	-L. -L.. -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-USE_BISON=	build
+USES=		bison pathfix
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
 DOCS=		HISTORY NEWS README TODO
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 519996367535..ce8e5f2eae54 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	vips
-# Date created:		19 December 2003
-# Whom:			Lev Serebryakov <lev@FreeBSD.org>
-#
+# Created by: Lev Serebryakov <lev@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nip2
 PORTVERSION=	7.26.3
@@ -18,7 +14,7 @@ LIB_DEPENDS=	vips.3[0-9]:${PORTSDIR}/graphics/vips	\
 		gsl:${PORTSDIR}/math/gsl	\
 		xml2:${PORTSDIR}/textproc/libxml2
 
-USE_BISON=	build
+USES=		bison
 USE_GMAKE=	yes
 USE_GNOME=	gnomemimedata glib20 pkgconfig gtk20
 GNU_CONFIGURE=	yes
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 24f93e587f1f..b3e0fc3c658a 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick	\
 		cdf.0:${PORTSDIR}/science/cdf
 
 USE_XORG=	xinerama xext xpm xmu sm ice 
-USE_BISON=	build
+USES=		bison
 USE_GCC=	any
 USE_GL=		yes
 USE_MOTIF=	yes
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 0e27d2768540..e3a36ac3e3be 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -33,7 +33,7 @@ CMAKE_ARGS=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex \
 		-DUSE_TBB:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include/flex
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/picviz/Makefile b/graphics/picviz/Makefile
index 2cabef7996ff..9d6da1728234 100644
--- a/graphics/picviz/Makefile
+++ b/graphics/picviz/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	picviz
-# Date created:         08 Nov 2008
-# Whom:                 Tim Hemel
-#
+# Created by: Tim Hemel
 # $FreeBSD$
-#
 
 PORTNAME=	picviz
 PORTVERSION=	0.4
@@ -20,7 +16,7 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
-USE_BISON=	build
+USES=		bison
 
 MAN1=		pcv.1
 
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 74b10fb322a2..8fa5fced693a 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pixie
-# Date created:		29 Jan 2004
-# Whom:			Igor Pokrovsky <tiamat@comset.net>
-#
+# Created by: Igor Pokrovsky <tiamat@comset.net>
 # $FreeBSD$
-#
 
 PORTNAME=	pixie
 PORTVERSION=	2.2.6
@@ -25,9 +21,8 @@ NOT_FOR_ARCHS=	amd64
 
 WRKSRC=		${WRKDIR}/Pixie
 
-USE_GNOME=	gnomehack
 USE_GL=		glu
-USE_BISON=	build
+USES=		bison pathfix
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
 		--libdir=${PREFIX}/lib/pixie \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 081735b9ede4..6e4bf32c49a0 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qgis
-# Date created:		Apr 2006
-# Whom:			Laurent Courty
-#
+# Created by: Laurent Courty
 # $FreeBSD$
-#
 
 PORTNAME=	qgis
 PORTVERSION=	1.8.0
@@ -24,7 +20,7 @@ LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_BISON=	build
+USES=		bison
 USE_CMAKE=	yes
 USE_SQLITE=	yes
 USE_QT4=	gui svg xml network sql designer linguist_build \
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index acd1337ca6a6..b3a0aa0f84f7 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	sswf
-# Date created:				Oct 17, 2005
-# Whom:					anhot
-#
+# Created by: anhot
 # $FreeBSD$
-#
 
 PORTNAME=	sswf
 PORTVERSION=	1.8.4
@@ -20,7 +16,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_BISON=	build
+USES=		bison
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile
index d738d4a78fd4..120b87f1ff55 100644
--- a/graphics/tumble/Makefile
+++ b/graphics/tumble/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lcdtest
-# Date created:				12 Jan 2010
-# Whom:					Rob Farmer <rfarmer@predatorlabs.net>
-#
+# Created by: Rob Farmer <rfarmer@predatorlabs.net>
 # $FreeBSD$
-#
 
 PORTNAME=	tumble
 PORTVERSION=	0.33
@@ -20,6 +16,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
 USE_GMAKE=	yes
+USES=		bison
 USE_BISON=	build
 
 MAKE_JOBS_SAFE=	yes