- Trim Makefile header per new style guidelines

- Convert to contemporary OPTIONS framework
- Drop maintainership, this port is stable enough to fly solo
- Cleanup Makefiles, reformat pkg-descr and add WWW line

games/quake3-data/Makefile

@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Quake 3 paks
-# Date created:				1st March 2003
-# Whom:					nik@FreeBSD.org
-#
+# Created by: Nik Clayton <nik@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	data
 DISTVERSION=	1.32b-3
@@ -15,41 +11,41 @@ PKGNAMEPREFIX=	${Q3PKGNAMEPREFIX}
 DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake III Arena data files
 
+DATADIR=	${Q3DIR}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	TEAMARENA "Install Quake III Team Arena data files" on
-
-DATADIR=	${Q3DIR}
-
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	TEAMARENA
+OPTIONS_DEFAULT=	TEAMARENA
+TEAMARENA_DESC=		Install Quake III Team Arena data files
+
+.include "Makefile.include"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTEAMARENA}
+PLIST_SUB+=	TEAMARENA=""
+.else
+PLIST_SUB+=	TEAMARENA="@comment "
+.endif
+
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf - >/dev/null
 
-.include "Makefile.include"
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_TEAMARENA)
-PLIST_SUB+=	TEAMARENA=""
-.else
-PLIST_SUB+=	TEAMARENA="@comment "
-.endif
-
 do-install:
 	@${MKDIR} ${DATADIR}
-	@${CP} -R ${WRKSRC}/baseq3 ${DATADIR}
+	${CP} -R ${WRKSRC}/baseq3 ${DATADIR}
 	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps
-.if !defined(WITHOUT_TEAMARENA)
-	@${CP} -R ${WRKSRC}/missionpack ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps
+.if ${PORT_OPTIONS:MTEAMARENA}
+	${CP} -R ${WRKSRC}/missionpack ${DATADIR}
 .endif
 
 post-install:
@@ -57,4 +53,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

games/quake3-data/Makefile.include

@@ -1,23 +1,23 @@
-# Makefile for defining variables used by other Quake3 related ports.
+# Makefile for defining variables used by other Quake3 related ports
 
-# Set variables.
+# Set variables
 
 Q3PKGNAMEPREFIX?=quake3-
 Q3DIR?=		${PREFIX}/share/quake3
 
-# Add them to the environment.
+# Add them to the environment
 
 MAKE_ENV+=	Q3DIR="${Q3DIR}"
 PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
 SUB_LIST+=	Q3DIR="${Q3DIR}"
 
-# Add the dependency.
+# Add the dependency
 
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
 .endif
 
-# DOS to Unix text conversion.
+# DOS to Unix text conversion
 
 .if defined(USE_CRLF)
 .   if defined(USE_ZIP)

games/quake3-data/pkg-descr

@@ -3,5 +3,7 @@ Quake III Arena data files.
 This port installs the data files needed to run Quake III Arena. It also uses
 the update, and has an option to install Quake III Team Arena data files.
 
-You still need to have a legitimate copy of the game in order to obtain
-the .pk3 files.
+You still need to have a legitimate copy of the game in order to obtain the
+*.pk3 files.
+
+WWW: http://www.idsoftware.com/games/quake/quake3-arena