- Give one OPTION a better name (DM -> DM_MAPS)

- Cleanup Makefile, files/pkg-message.in
- Augment port description text, point to an active
  website in WWW line
- Remove now useless check for PORT_OPTIONS:MDOCS
- Take maintainership back; fix Makefile header

4 files changed, 18 insertions, 18 deletions

diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile
index d872e79c160b..d2c1662cef17 100644
--- a/games/quake2-zaero/Makefile
+++ b/games/quake2-zaero/Makefile
@@ -1,4 +1,4 @@
-# Created by: alepulver
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	zaero
@@ -10,23 +10,22 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-src-${PORTVERSION}-2${EXTRACT_SUFX}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II Zaero Mission Pack
 
 USES=		dos2unix zip
 DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 
-OPTIONS_DEFINE=	DEMO DM DOCS
-DEMO_DESC=	Demo version of the game data
-DM_DESC=	Deathmatch maps
+DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
+OPTIONS_DEFINE=	DEMO DM_MAPS DOCS
 OPTIONS_SUB=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
+DEMO_DESC=	Demo version of the game data
+DM_MAPS_DESC=	Install deathmatch maps
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEMO}
@@ -35,7 +34,7 @@ DISTFILES+=	zaerodemo${EXTRACT_SUFX}
 SUB_FILES+=	pkg-message
 .endif
 
-.if ${PORT_OPTIONS:MDM}
+.if ${PORT_OPTIONS:MDM_MAPS}
 DISTFILES+=	zaerodm${EXTRACT_SUFX}
 .endif
 
@@ -51,15 +50,15 @@ do-install:
 .if ${PORT_OPTIONS:MDEMO}
 	${INSTALL_DATA} ${WRKSRC}/zaero/pak0.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}/sprites
-	${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* ${STAGEDIR}${Q2DIR}/${PORTNAME}/sprites
+	${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* \
+		${STAGEDIR}${Q2DIR}/${PORTNAME}/sprites
 .endif
 	${INSTALL_DATA} ${WRKSRC}/pak1.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDM}
-	${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
+.if ${PORT_OPTIONS:MDM_MAPS}
+	${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak \
+		${STAGEDIR}${Q2DIR}/${PORTNAME}
 .endif
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changelog.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/quake2-zaero/files/pkg-message.in b/games/quake2-zaero/files/pkg-message.in
index 41fc10f0db2a..1c249fb472e1 100644
--- a/games/quake2-zaero/files/pkg-message.in
+++ b/games/quake2-zaero/files/pkg-message.in
@@ -1,7 +1,7 @@
 ==============================================================================
 
 To complete the installation of this port you need to copy the file
-"zaero/pak0.pak" from the original Quake II: Zaero Mission Pack distribution
-to "%%Q2DIR%%/zaero".
+"zaero/pak0.pak" from the original Quake II: Zaero mission pack distribution
+to %%Q2DIR%%/zaero.
 
 ==============================================================================
diff --git a/games/quake2-zaero/pkg-descr b/games/quake2-zaero/pkg-descr
index c7c67c0c0bf7..50ec1a591f6d 100644
--- a/games/quake2-zaero/pkg-descr
+++ b/games/quake2-zaero/pkg-descr
@@ -1,3 +1,4 @@
-Quake II: Zaero Mission Pack.
+This is unofficial mission pack for Quake II, developed by Team Evolve and
+published by Macmillan Software, which was released in 1998.
 
-WWW: http://teamevolve.planetquake.gamespy.com/products/index.html
+WWW: http://www.quakewiki.net/archives/teamevolve/products/
diff --git a/games/quake2-zaero/pkg-plist b/games/quake2-zaero/pkg-plist
index 115ca4f29f90..6017822acbbe 100644
--- a/games/quake2-zaero/pkg-plist
+++ b/games/quake2-zaero/pkg-plist
@@ -2,7 +2,7 @@
 %%Q2DIR%%/zaero/game.so
 %%DEMO%%%%Q2DIR%%/zaero/pak0.pak
 %%Q2DIR%%/zaero/pak1.pak
-%%DM%%%%Q2DIR%%/zaero/pak2.pak
+%%DM_MAPS%%%%Q2DIR%%/zaero/pak2.pak
 %%DEMO%%%%Q2DIR%%/zaero/sprites/plasma1.sp2
 %%DEMO%%%%Q2DIR%%/zaero/sprites/plasma1_0.pcx
 %%DEMO%%%%Q2DIR%%/zaero/sprites/plasma1_1.pcx