Convert from USE_GETTEXT to USES= gettext

While here:
- Trim some headers
- Convert to new options framework

7 files changed, 47 insertions, 59 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 43ba1d36790c..c6fd1cc96c3c 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -42,7 +42,7 @@ GCC46_DESC=	Build with GCC 4.6+ (better OpenMP support)
 
 OPTIONS_DEFAULT=	GPHOTO RAWSPEED GCC46
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGPHOTO}
 LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
@@ -102,7 +102,7 @@ CMAKE_ARGS+=	-DBUILD_SLIDESHOW:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=	gettext
 .else
 CMAKE_ARGS+=	-DUSE_NLS:BOOL=OFF
 .endif
@@ -138,4 +138,4 @@ post-install:
 	@${REINPLACE_CMD} -e '/LC_MESSAGES/d' ${TMPPLIST}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 4efbce1e1ab5..d99eceff02b0 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	epdfview
-# Date created:				2006/06/01
-# Whom:					chinsan <chinsan.tw@gmail.com>
-#
+# Created by: chinsan <chinsan.tw@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
@@ -29,22 +25,21 @@ USE_GNOME=	gtk20 intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	CUPS	"Use cups printing system"		off \
-		NLS	"Native language support"		on
+OPTIONS_DEFINE=	CUPS NLS
 
 MAN1=	epdfview.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=--with-cups
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 .else
 CONFIGURE_ARGS+=--without-cups
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -63,4 +58,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/${PORTNAME}.desktop ${PREFIX}/share/applications/
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 0d9c3057a87e..cb36c42d2002 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -31,14 +31,14 @@ USE_XORG=	xinerama ice
 CONFIGURE_ARGS=	--with-gtk2
 CFLAGS+=	-DUSE_GTK2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MSPLASH)
+.if ! ${PORT_OPTIONS:MSPLASH}
 CONFIGURE_ARGS+=	--disable-splash
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=	gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -113,4 +113,4 @@ post-configure:
 		's/^(GDK_IMLIB_(CFLAGS|LIBS) =).*$$/$${1}/'
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 88f4264913cd..4b1e68f495f6 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -94,8 +94,6 @@ NVTHREADS_DESC=	Link with threads (needed for nvidia)
 USE_QT4=		qmake_build moc_build rcc_build uic_build linguist_build corelib gui
 .endif
 
-.include <bsd.port.pre.mk>
-
 # allow the use localized gd ports in Makefile.local or slave ports.
 GD_PORT?=	graphics/gd
 
@@ -152,7 +150,7 @@ PLIST_SUB+=		WITH_XPM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=	gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
@@ -481,4 +479,4 @@ post-install: install-ldconfig-file
 		${EXAMPLESDIR}/pathplan_data/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index c912fc3789ec..45e65ba464c7 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -50,14 +50,14 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include "Makefile.man"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MUSB)
+.if ! ${PORT_OPTIONS:MUSB}
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=	gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-translations
@@ -125,4 +125,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 2ea50a8166b6..c06dcea4859d 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfig
-# Date created:		4 January 1995
-# Whom:			roberto
-#
+# Created by: roberto
 # $FreeBSD$
-#
 
 PORTNAME=	xfig
 PORTVERSION=	3.2.5b
@@ -36,23 +32,24 @@ MAKE_ARGS+=	INSTALLFLAGS="${COPY}" \
 		INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
 		INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
 
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET=	install install.libs install.html
-.endif
+OPTIONS_DEFINE=	GHOSTSCRIPT I18N DOCS
+OPTIONS_DEFAULT=	GHOSTSCRIPT I18N
+I18N_DESC=	I18N support and Japanese docs
 
-OPTIONS=	GHOSTSCRIPT "Ghostscript support" on \
-		I18N "I18N support and Japanese docs" on
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MDOCS}
+INSTALL_TARGET=	install install.libs install.html
+.endif
 
-.if defined(WITHOUT_I18N) || defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MI18N} || ! ${PORT_OPTIONS:MDOCS}
 PLIST_SUB+=	JPORTDOCS="@comment "
 .else
 PLIST_SUB=	JPORTDOCS=""
 .endif
 
-.if !defined(WITHOUT_I18N)
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MI18N}
+USES+=	gettext
 .endif
 
 post-extract:
@@ -64,15 +61,15 @@ post-extract:
 	@${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC}
 
 post-patch:
-.if defined(WITHOUT_GHOSTSCRIPT)
-.if defined(WITHOUT_I18N)
+.if ! ${PORT_OPTIONS:MGHOSTSCRIPT}
+.if ! ${PORT_OPTIONS:MI18N}
 	@${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .else
 	@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' \
 		-e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .endif
-.elif !defined(WITHOUT_I18N)
+.elif ${PORT_OPTIONS:MI18N}
 	@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' ${WRKSRC}/Imakefile
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 4f7583d5d698..a57bd6f6eef0 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xmorph
-# Date created:         Thu Aug  1 09:10:22 CDT 1996
-# Whom:                 erich@FreeBSD.org
-#
+# Created by: erich@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xmorph
 PORTVERSION=	2006.08.17
@@ -32,6 +28,16 @@ USE_LDCONFIG=	yes
 MAN1=		gtkmorph.1 xmorph.1
 INFO=		xmorph
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgtk20}!=""
@@ -41,14 +47,6 @@ CONFIGURE_ARGS+=	--with-gtk=2
 CONFIGURE_ARGS+=	--without-gtkmorph
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/*.info*
 
@@ -56,7 +54,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^LDFLAGS=|#LDFLAGS=|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}