Convert from USE_GETTEXT to USES= gettext

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

4 files changed, 33 insertions, 44 deletions

diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 0465d827216f..e09c8bdf8f36 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mednafen
-# Date created:		2006-02-28
-# Whom:			Charlie & <root@bsd.org.pe>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	mednafen
 PORTVERSION=	0.8.B
@@ -30,17 +25,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
 WRKSRC=	${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
 
-OPTIONS=	NLS	"Native Language Support"	on
+OPTIONS_DEFINE=	NLS DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
 PLIST_SUB+=	NLS=""
 FLAG_NLS=	true
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${ARCH}==sparc64
@@ -53,10 +48,10 @@ pre-configure:
 			${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Documentation/mednafen.html ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index e09802e7960b..4d38943049e9 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -44,14 +44,14 @@ PORTDOCS=	ChangeLog README
 # accessed through libcdio (using cam(4) and pass(4))
 DEFAULT_DVD_DEVICE?=	/dev/cd0
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-dynarec=x86_64
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=	gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
@@ -78,4 +78,4 @@ post-install:
 .endif
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7166666892db..3c90ef7433fe 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -85,14 +85,10 @@ FIX_XAW=	src/arch/unix/x11/xaw/about.c \
 		src/arch/unix/x11/xaw/widgets/MultiListP.h \
 		src/arch/unix/x11/xaw/widgets/ScrList.c \
 
-.if !defined(NOPORTDOCS)
-INFO=		vice
-.endif
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION}<800063
-LIB_DEPENDS+=		usb:${PORTSDIR}/devel/libusb
+.if ${PORT_OPTIONS:MDOCS}
+INFO=		vice
 .endif
 
 .if exists(${LOCALBASE}/bin/fc-cache)
@@ -108,9 +104,9 @@ PLIST_SUB+=		NOFCCACHE=""
 LIB_DEPENDS+=		avcodec:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
 PATCH_DEPENDS+=		${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv
-USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-nls --localedir=${LOCALBASE}/share/locale
 # causes vice to crash:
 #LDFLAGS+=		-lgettextlib
@@ -145,10 +141,10 @@ post-patch:
 	${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin"
 	${LOCALBASE}/bin/iconv -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}"
 .endfor
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 .if defined(VICE_WITH_XAW3D)
 .for i in ${FIX_XAW}
 	${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i}
@@ -157,7 +153,7 @@ post-patch:
 .endif
 
 pre-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .endif
 	${MKDIR} ${PREFIX}/lib/vice/fonts
@@ -165,8 +161,8 @@ pre-install:
 		${PREFIX}/lib/vice/fonts/
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 051b43c1f09c..829b3c152b50 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    visualboyadvance-m
-# Date created:         2010-01-02
-# Whom:                 Nicole Reid <root@cooltrainer.org>
-#
+# Created by: Nicole Reid <root@cooltrainer.org>
 # $FreeBSD$
-#
 
 PORTNAME=	visualboyadvance-m
 PORTVERSION=	1.8.0r${SVN_REV}
@@ -18,8 +14,10 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
 		sfml-system.1:${PORTSDIR}/devel/sfml
 
-OPTIONS=	GVBAM "Build gvbam (GTK2 frontend)" on \
-		ASM "Enable ASM core and filters (i386 only)" off
+OPTIONS_DEFINE=	GVBAM NLS
+OPTIONS_DEFAULT=	GVBAM
+OPTIONS_DEFINE_i386=	ASM
+GVBAM_DESC=	Build gvbam (GTK2 frontend)
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
@@ -32,14 +30,14 @@ USES=		cmake
 CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"
 SVN_REV=	1001
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ASM) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MASM}
 BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
 CMAKE_ARGS+=	-DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes
 .endif
 
-.if defined(WITH_GVBAM)
+.if ${PORT_OPTIONS:MGVBAM}
 PLIST_SUB+=	GVBAM=""
 USE_GNOME=	gtk20
 LIB_DEPENDS+=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
@@ -52,8 +50,8 @@ PLIST_SUB+=	GVBAM="@comment "
 CMAKE_ARGS+=	-DENABLE_GTK:BOOL=no
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=yes
 PLIST_SUB+=	NLS=""
 .else
@@ -80,4 +78,4 @@ maint-gen-distfile:
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
 	${RM} -rf ${DISTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>