3 files changed, 34 insertions, 32 deletions
diff --git a/games/quake-data/Makefile b/games/quake-data/Makefile
index 4e78519280af..1ed953f93b6b 100644
--- a/games/quake-data/Makefile
+++ b/games/quake-data/Makefile
@@ -12,55 +12,54 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:qs
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake data files
 
 BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
+DATADIR=	${Q1DIR}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	FULL "Install full version" off \
-		QUAKEWORLD "Install QuakeWorld data" on \
-		QUAKEWORLD_SKINS "Install QuakeWorld skins" on
-
-DATADIR=	${Q1DIR}
-
 PROGFILE=	qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
 SKINFILES=	skinbase.zip qw_skins.zip
 
-.include "Makefile.include"
+OPTIONS_DEFINE=	FULL QW_DATA QW_SKINS
+OPTIONS_DEFAULT=	QW_DATA QW_SKINS
+
+FULL_DESC=	Install full game version
+QW_DATA_DESC=	Install QuakeWorld data
+QW_SKINS_DESC=	Install QuakeWorld skins
 
-.include <bsd.port.pre.mk>
+.include "Makefile.include"
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FULL)
+.if ${PORT_OPTIONS:MFULL}
 DISTFILES+=	pak1.pak
 PLIST_SUB+=	FULL=""
 .else
 PLIST_SUB+=	FULL="@comment "
 .endif
 
-.if !defined(WITHOUT_QUAKEWORLD)
+.if ${PORT_OPTIONS:MQW_DATA}
 MASTER_SITES+=	${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
 DISTFILES+=	${PROGFILE}:qw
 EXTRACT_ONLY+=	${PROGFILE}
 PLIST_SUB+=	QUAKEWORLD=""
-
-.if !defined(WITHOUT_QUAKEWORLD_SKINS)
+.  if ${PORT_OPTIONS:MQW_SKINS}
 MASTER_SITES+=	${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|}
 DISTFILES+=	${SKINFILES:S/$/:skins/}
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 PLIST_SUB+=	QUAKEWORLD_SKINS=""
-.else
+.  else
 PLIST_SUB+=	QUAKEWORLD_SKINS="@comment "
-.endif
-
+.  endif
 .else
 PLIST_SUB+=	QUAKEWORLD="@comment "
-.endif	# !WITHOUT_QUAKEWORLD
+.endif
 
 pre-fetch:
-.if defined(WITH_FULL) && !exists(${DISTDIR}/${DIST_SUBDIR}/pak1.pak)
+.if ${PORT_OPTIONS:MFULL} && !exists(${DISTDIR}/${DIST_SUBDIR}/pak1.pak)
 	@${ECHO_CMD}
 	@${ECHO_CMD} You need to copy the file pak1.pak from the original Quake CDROM to ${DISTDIR}/${DIST_SUBDIR} in order to install this port. | ${FMT}
 	@${ECHO_CMD}
@@ -68,22 +67,22 @@ pre-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${DATADIR}/id1
+	@${MKDIR} ${DATADIR}/id1
 	${INSTALL_DATA} ${WRKSRC}/id1/pak0.pak ${DATADIR}/id1
-.if defined(WITH_FULL)
+.if ${PORT_OPTIONS:MFULL}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak1.pak ${DATADIR}/id1
 .endif
-.if !defined(WITHOUT_QUAKEWORLD)
+.if ${PORT_OPTIONS:MQW_DATA}
 	@${MKDIR} ${DATADIR}/qw
-	@${INSTALL_DATA} ${WRKSRC}/qw/qwprogs.dat ${DATADIR}/qw
+	${INSTALL_DATA} ${WRKSRC}/qw/qwprogs.dat ${DATADIR}/qw
 	@${MKDIR} ${DATADIR}/qw/skins
-	@${INSTALL_SCRIPT} ${WRKSRC}/qw/skins/fixskins.sh ${DATADIR}/qw/skins
-. if !defined(WITHOUT_QUAKEWORLD_SKINS)
+	${INSTALL_SCRIPT} ${WRKSRC}/qw/skins/fixskins.sh ${DATADIR}/qw/skins
+. if ${PORT_OPTIONS:MQW_SKINS}
 .   for f in ${SKINFILES}
 	@${UNZIP_CMD} -nq ${DISTDIR}/${DIST_SUBDIR}/${f} -d ${DATADIR}/qw/skins
 .   endfor
 	@(cd ${DATADIR}/qw/skins && LANG=C ./fixskins.sh *)
 . endif
-.endif	# !WITHOUT_QUAKEWORLD
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/quake-data/Makefile.include b/games/quake-data/Makefile.include
index 523db43902e4..93cc12214fa2 100644
--- a/games/quake-data/Makefile.include
+++ b/games/quake-data/Makefile.include
@@ -1,17 +1,18 @@
-# Makefile for defining variables used by other Quake related ports.
+# Makefile for defining variables used by other Quake related ports.  See
+# `games/quake2-data/Makefile.include' for extensive description.
 
-# Set variables.
+# Set variables
 
-Q1PKGNAMEPREFIX?=quake-
+Q1PKGNAMEPREFIX?=	quake-
 Q1DIR?=		${LOCALBASE}/share/quake
 
-# Add them to the environment.
+# Add them to the environment
 
 MAKE_ENV+=	Q1DIR="${Q1DIR}"
 PLIST_SUB+=	Q1DIR="${Q1DIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	Q1DIR="${Q1DIR}"
 
-# Add the dependency.
+# Add the dependency
 
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data
diff --git a/games/quake-data/pkg-descr b/games/quake-data/pkg-descr
index b55865bb7dc1..ed8b9564d384 100644
--- a/games/quake-data/pkg-descr
+++ b/games/quake-data/pkg-descr
@@ -5,4 +5,6 @@ This port installs the data files needed to run Quake.
 You still need to have a legitimate copy of the game in order to obtain
 the full game, otherwise you can use the shareware version.
 
-This port can also install the QuakeWorld data files, skins and sources.
+This port can also install the QuakeWorld data files and skins.
+
+WWW: http://www.idsoftware.com/games/quake/quake/