Trim Makefile header; convert to OptionsNG (courtesy of jgh@).

2 files changed, 25 insertions, 27 deletions

diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile
index f96793b416dc..d63091b608f5 100644
--- a/games/quake2-extras/Makefile
+++ b/games/quake2-extras/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-extras
-# Date created:				27 Jul 2006
-# Whom:					alepulver
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	extras
 PORTVERSION=	1.0
@@ -22,9 +18,12 @@ COMMENT=	Quake II extras (high quality textures and skins)
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	RETEXTURE "Install high quality textures" on \
-		RETEXTURE_FULL "Install more textures (120MB)" off \
-		SKINS "Install high quality skins" off
+OPTIONS_DEFINE=	RETEXTURE RETEXTURE_FULL SKINS
+OPTIONS_DEFAULT=	RETEXTURE
+
+RETEXTURE_DESC=		Install high quality textures
+RETEXTURE_FULL_DESC=	Install more textures (120MB)
+SKINS_DESC=		Install high quality skins
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
@@ -33,15 +32,14 @@ RETEX_FULL=	all_q2_textures_07_17_2006.zip
 SKINS=		models.zip
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_RETEXTURE_FULL) || defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MRETEXTURE_FULL} || ${PORT_OPTIONS:MSKINS}
 BUILD_DEPENDS+=	nwreckdum:${PORTSDIR}/archivers/nwreckdum
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak20.pak
 .endif
 
-.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL)
+.if ${PORT_OPTIONS:MRETEXTURE} && ${PORT_OPTIONS:MRETEXTURE_FULL}
 .for i in ${RETEX_PAKS}
 DISTFILES+=	pak${i}.pak:retex
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak${i}.pak
@@ -51,47 +49,47 @@ PLIST_SUB+=	RETEX=""
 PLIST_SUB+=	RETEX="@comment "
 .endif
 
-.if defined(WITH_RETEXTURE_FULL)
+.if ${PORT_OPTIONS:MRETEXTURE_FULL}
 DISTFILES+=	${RETEX_FULL}:retex2
 EXTRACT_ONLY+=	${RETEX_FULL}
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak10.pak
 .endif
 
-.if defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 DISTFILES+=	${SKINS}:retex2
 EXTRACT_ONLY+=	${SKINS}
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak20.pak
 .endif
 
 post-extract:
-.if defined(WITH_RETEXTURE_FULL)
+.if ${PORT_OPTIONS:MRETEXTURE_FULL}
 	@${MKDIR} ${WRKSRC}/pak10
 	@${MV} ${WRKSRC}/textures ${WRKSRC}/pak10
 .endif
-.if defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 	@${MKDIR} ${WRKSRC}/pak20
 	@${MV} ${WRKSRC}/models ${WRKSRC}/pak20
 .endif
 
 do-build:
-.if defined(WITH_RETEXTURE_FULL)
+.if ${PORT_OPTIONS:MRETEXTURE_FULL}
 	@nwreckdum -c -p ${WRKSRC}/pak10.pak -d ${WRKSRC}/pak10
 .endif
-.if defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 	@nwreckdum -c -p ${WRKSRC}/pak20.pak -d ${WRKSRC}/pak20
 .endif
 
 do-install:
-.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL)
-.for i in ${RETEX_PAKS}
+.if ${PORT_OPTIONS:MRETEXTURE} && empty(PORT_OPTIONS:MRETEXTURE_FULL)
+.  for i in ${RETEX_PAKS}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak${i}.pak ${Q2DIR}/baseq2
-.endfor
+.  endfor
 .endif
-.if defined(WITH_RETEXTURE_FULL)
+.if ${PORT_OPTIONS:MRETEXTURE_FULL}
 	${INSTALL_DATA} ${WRKSRC}/pak10.pak ${Q2DIR}/baseq2
 .endif
-.if defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 	${INSTALL_DATA} ${WRKSRC}/pak20.pak ${Q2DIR}/baseq2
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/quake2-extras/pkg-descr b/games/quake2-extras/pkg-descr
index 0d055f50b728..0328e27a03f0 100644
--- a/games/quake2-extras/pkg-descr
+++ b/games/quake2-extras/pkg-descr
@@ -1,6 +1,6 @@
-This port installs various Quake II extras:
+This port installs several Quake II extras:
 
-- High quality texture pack (requires support in engine).
-- High quality skin pack (requires JPEG and PNG support in engine).
+  - High quality texture pack (requires support in engine)
+  - High quality skin pack (requires JPEG and PNG support in engine)
 
 WWW: http://www-personal.umich.edu/~jimw/q2/index.htm