8 files changed, 14 insertions, 21 deletions

diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index a44579752f08..48920b2d2f0b 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -20,9 +20,8 @@ GH_COMMIT=	28cade5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	aclocal automake
-USE_GMAKE=	yes
 AUTOMAKE_ARGS=	--add-missing
 USE_GCC=	any # uses nested functions (gcc ext.)
 
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 9c696444cb94..954eced1ec0a 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for:	gkrellkam2
-# Date Created:		24 Nov 2002
-# Whom:			Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-# $Id: Makefile,v 1.1.1.1 2002/11/24 03:37:56 jylefort Exp $
-#
 
-PORTNAME=		gkrellkam
-PORTVERSION=		2.0.0
+PORTNAME=	gkrellkam
+PORTVERSION=	2.0.0
 PORTREVISION=	12
-CATEGORIES=		graphics
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
-DISTNAME=		${PORTNAME}_${PORTVERSION}
+CATEGORIES=	graphics
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM plugin that display thumbnails of periodically updated images
@@ -20,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkre
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 LATEST_LINK=	gkrellkam2
 
 MAN5=		gkrellkam-list.5
diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile
index b0426ea5b729..2fae7c7329a9 100644
--- a/graphics/mandelbulber/Makefile
+++ b/graphics/mandelbulber/Makefile
@@ -13,7 +13,7 @@ COMMENT=	3D Mandelbrot fractal renderer
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	glib20 gtk20
 BUILD_WRKSRC=	${WRKSRC}/makefiles
 MAKEFILE=	makefile
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 174e00d5b753..3e43c39ccc68 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -15,9 +15,9 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/mview-${PORTVERSION}
 
+USES=		gmake pkgconfig
 USE_GL=		glu
 USE_QT4=	corelib gui opengl moc_build
-USE_GMAKE=	yes
 CXXFLAGS+=	-I. -Imesh -Imathvector \
 		`pkg-config --cflags QtOpenGL glu`
 LDFLAGS+=	${PTHREAD_LIBS} \
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 709f901af909..f1eecf12dd2f 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		unrar:${PORTSDIR}/archivers/unrar
 USE_QT4=	corelib gui linguist_build moc_build qmake_build rcc_build \
 		uic_build xml
-USES=		cmake
+USES=		cmake pkgconfig
 
 PLIST_FILES=	\
 		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop \
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index 1357e7892728..f29f5da8ab1a 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		gimp-2.0:${PORTSDIR}/graphics/gimp-app
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 BIN_TARGETS=	separate separate_import icc_colorspace
 L10N_TARGETS=	cs es fr ja ko pl ru
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 074938c0e115..876b86898beb 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -26,10 +26,9 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		rest:${PORTSDIR}/devel/librest
 
 USE_XZ=		yes
-USES=		shebangfix gettext desktop-file-utils
+USES=		shebangfix gettext desktop-file-utils gmake pkgconfig
 USE_GNOME=	gnomehier gconf2 gtk20 librsvg2
 USE_SQLITE=	3
-USE_GMAKE=	yes
 USE_GSTREAMER1=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-icon-update
diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile
index e37d4c67c30a..33ab0df7e6f6 100644
--- a/graphics/zathura-djvu/Makefile
+++ b/graphics/zathura-djvu/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
 
 USE_GNOME=	glib20 gtk20
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 PLIST_FILES=	lib/zathura/djvu.so
 PLIST_DIRSTRY=	lib/zathura