Convert to USES=imake

While here:
Trim headers,
Remove some indefinite article
Mark xmagv as broken given it doesn't build
Convert to new options framework

13 files changed, 37 insertions, 50 deletions

diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index 0f7c68a4e78f..0e36024482dc 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:	SciPlot
-# Date created:		Mon June 8 2004
-# Whom:			thierry@pompo.net
+# Created by: thierry@pompo.net
 #
 # $FreeBSD$
 #
@@ -13,10 +11,10 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets
 
 MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	A full-featured Xt widget to display 2D data in a graph
+COMMENT=	Full-featured Xt widget to display 2D data in a graph
 
+USES=		imake
 USE_MOTIF=	yes
-USE_IMAKE=	yes
 USE_XORG=	xp
 MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
 USE_LDCONFIG=	yes
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 1236b79222a8..b4661f2fc968 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -30,6 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	USB_CFLAGS="-I/usr/include" \
 		USB_LIBS="-L/usr/lib -lusb"
+MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 OPTIONS_DEFINE=	SANE MANPAGES
 
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 9931c40df7fc..54ef516378e9 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=yes --with-x11
+MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 MAN1=		gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
 
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index 6bb81713fc99..ec5a3a22ec90 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -1,9 +1,5 @@
-# ports collection makefile for:	lfview
-# Date created:		24 February 1999
-# Whom:			Yuu Yashiki
-#
+# Created by: Yuu Yashiki
 # $FreeBSD$
-#
 
 PORTNAME=	lfview
 PORTVERSION=	1.1a
@@ -15,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphic viewer for Leaf products
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=	yes
@@ -31,7 +27,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lfview ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${PREFIX}/lib
 	${LN} -s ${PREFIX}/lib/liblfv_leaf.so.1 ${PREFIX}/lib/liblfv_leaf.so
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/share/doc/ja/lfview
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja/lfview
 .endif
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 2f94f91a9e76..107cad9293ba 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -31,6 +31,7 @@ CONFIGURE_ARGS=	--with-svgz \
 		--enable-gtk-theme
 CROCO_VERSION=	0.6
 MAN1=		rsvg-convert.1
+MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index bc27ea69f302..53d0269f6824 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -20,8 +20,8 @@ BUILD_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		imake
 USE_XORG=	xpm xbitmaps x11 xaw xmu xt sm ice xext
-USE_IMAKE=	yes
 
 CFLAGS+=	-D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= \
 		-D_X_DEPRECATED= -DUSG
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index 479bf1c8c5fe..303276996d15 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Plotmtv
-# Date created:		19 October 1996
-# Whom:			pgs
-#
+# Created by: pgs
 # $FreeBSD$
-#
 
 PORTNAME=	plotmtv
 PORTVERSION=	1.4.1
@@ -16,19 +12,21 @@ MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multipurpose X11 plotting program
+COMMENT=	Multipurpose X11 plotting program
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xt
 ALL_TARGET=	World
 MAN1=		plotmtv.1
 MAKE_JOBS_UNSAFE=	yes
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.c | ${XARGS} ${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/'
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR}  ${PREFIX}/share/doc/plotmtv/Tests
 	@${INSTALL_DATA} ${WRKSRC}/Docs/DataFormat.ps.Z \
 		${PREFIX}/share/doc/plotmtv
@@ -49,4 +47,4 @@ post-install:
 .endfor
 .endif
 
-.include	<bsd.port.mk>
+.include <bsd.port.mk>
diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile
index 68de97946685..bf7bbbbccccd 100644
--- a/graphics/poppler-glib/Makefile
+++ b/graphics/poppler-glib/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Glib bindings to poppler
 MASTERDIR=	${.CURDIR}/../../graphics/poppler
 SLAVEPORT=	glib
 PLIST=	${.CURDIR}/pkg-plist
+MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 pre-build:
 	@cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 58a75b527a1f..e348f698a290 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xbmbrowser
-# Date created:		06 September 1995
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xbmbrowser
 PORTVERSION=	5.1
@@ -16,7 +12,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View complete directories of X bitmaps and X pixmaps
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw xmu
 MAN1=		xbmbrowser.1
 
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index 848ee0277447..46247b2f8ee0 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -1,9 +1,5 @@
-# ports collection makefile for:	xmagv
-# Date created:		25 Oct 1998
-# Whom:			Seiichirou Hiraoka
-#
+# Created by: Seiichirou Hiraoka
 # $FreeBSD$
-#
 
 PORTNAME=	xmagv
 PORTVERSION=	1.11
@@ -15,9 +11,10 @@ DISTFILES=	xmagv111.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer for X Window System
 
+BROKEN=		Does not build
+USES=		imake:env
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-USE_IMAKE=	yes
 USE_XORG=	x11 xext
 XMKMF=		xmkmf
 MANLANG=	. ja
diff --git a/graphics/xoris/Makefile b/graphics/xoris/Makefile
index b93fb7daad5b..b58236e3a2e0 100644
--- a/graphics/xoris/Makefile
+++ b/graphics/xoris/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xoris
-# Date created:				02 April 2006
-# Whom:					Alexander Gromnitsky
-#
+# Created by: Alexander Gromnitsky
 # $FreeBSD$
-#
 
 PORTNAME=	xoris
 PORTVERSION=	0.1e
@@ -12,18 +8,21 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	alexander.gromnitsky@gmail.com
-COMMENT=	An X11 pixel color grabber
+COMMENT=	X11 pixel color grabber
 
+USES=		imake
 USE_IMAKE=	yes
 USE_XORG=	x11
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 SUB_FILES=	pkg-message
 .endif
 
 post-install:
 	@ ${INSTALL_SCRIPT} ${FILESDIR}/xoris-run.sh ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${ECHO_MSG} "===>   Installing documentation for ${PORTNAME}"
 	@ ${MKDIR} ${DOCSDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff --git a/graphics/xtexcad/Makefile b/graphics/xtexcad/Makefile
index 5abd87b9d084..17c48ffab291 100644
--- a/graphics/xtexcad/Makefile
+++ b/graphics/xtexcad/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	TEX_CTAN/graphics/xtexcad
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing program enforcing limited slopes and diameters
 
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-USE_IMAKE=	yes
 
 MAN1=		xtexcad.1
 PLIST_FILES=	bin/xtexcad lib/X11/app-defaults/XTeXcad
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index ca378c033d65..7b18c9f4b314 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xwpick
-# Date created:				24 June 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	xwpick
 PORTVERSION=	2.20
@@ -15,11 +11,14 @@ MASTER_SITE_SUBDIR=applications
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image pick up utility for X Window System
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xwpick.1
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/xwpick
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/xwpick