Cleanup Makefiles, port descriptions and message files for two official

Quake II mission pack ports, and remove gratuitous differences between
them.

6 files changed, 42 insertions, 62 deletions

diff --git a/games/quake2-rogue/Makefile b/games/quake2-rogue/Makefile
index 6f735af1f554..c7853fa4daab 100644
--- a/games/quake2-rogue/Makefile
+++ b/games/quake2-rogue/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-rogue
-# Date created:				26 Jul 2006
-# Whom:					alepulver
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rogue
 PORTVERSION=	3.20
@@ -15,36 +11,28 @@ DISTNAME=	${PORTNAME}src${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Quake II Ground Zero (Rogue) Mission Pack
+COMMENT=	Quake II: Ground Zero (Rogue) official mission pack
 
 NO_WRKSUBDIR=	yes
-
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
+SUB_FILES=	pkg-message
 
 PLIST_FILES=	%%Q2DIR%%/${PORTNAME}/game.so
 PLIST_DIRS=	%%Q2DIR%%/${PORTNAME}
 
-SUB_FILES=	pkg-message
-
-.include "${.CURDIR}/../quake2-data/Makefile.include"
-
-.include <bsd.port.pre.mk>
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		uncompress -c ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \
 		${TAIL} +454 | ${SH}
 
 post-extract:
 	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/#include <nan.h>/d' ${WRKSRC}/g_local.h
+	@${REINPLACE_CMD} -e '/#include <nan\.h>/d' ${WRKSRC}/g_local.h
 	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]
 
 do-install:
-	${MKDIR} ${Q2DIR}/${PORTNAME}
+	@${MKDIR} ${Q2DIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
 
 post-install:
@@ -52,4 +40,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.mk>
diff --git a/games/quake2-rogue/files/pkg-message.in b/games/quake2-rogue/files/pkg-message.in
index 369f982534da..0fd45f29bd41 100644
--- a/games/quake2-rogue/files/pkg-message.in
+++ b/games/quake2-rogue/files/pkg-message.in
@@ -2,7 +2,7 @@
 
 To complete the installation of this port you need to copy the file
 "rogue/pak0.pak" and the directory "rogue/video" with its contents from the
-original Quake II: Ground Zero (Rogue) Mission Pack distribution to
-"%%Q2DIR%%/rogue".
+original Quake II: Ground Zero (Rogue) mission pack distribution to
+%%Q2DIR%%/rogue.
 
 ==============================================================================
diff --git a/games/quake2-rogue/pkg-descr b/games/quake2-rogue/pkg-descr
index 9e917837af5c..11f73c6d0886 100644
--- a/games/quake2-rogue/pkg-descr
+++ b/games/quake2-rogue/pkg-descr
@@ -1,19 +1,20 @@
-Quake II: Ground Zero (Rogue) Mission Pack.
+This is the second official Quake II expansion: Ground Zero (also known as
+Rogue, as developed by Rogue Entertainment).
 
 Take out the Big Gun sounded simple enough, except the Strogg were waiting.
-You, and a few marines like you, are the lucky ones. You've made it down in
-one piece and are still able to contact the fleet. The Gravity Well, the
-Strogg's newest weapon in its arsenal against mankind, is operational. With
+You, and a few marines like you, are the lucky ones.  You've made it down in
+one piece and are still able to contact the fleet.  The Gravity Well, the
+Strogg's newest weapon in its arsenal against mankind, is operational.  With
 the fleet around Stroggos, 5% of ground forces surviving, and that number
-dwindling by the second, your orders have change: free your comrades. Destroy
-the Gravity Well.
+dwindling by the second, your orders have change: free your comrades.
+Destroy the Gravity Well.
 
-- New Enemies -- The Stalker, Turrets, Daedalus, Medic Commander, Carrier, and
-  the Black Widow.
-- 14 Entirely new levels and 10 new deathmatch levels.
-- New Power-Ups -- Deathmatch specific power-ups: Vengeance Sphere, Hunter
-  Sphere, and Anti-matter bomb.
-- New Weapons -- The Chainsaw, ETF Rifle and Plasma Beam.
+  - New enemies -- The Stalker, Turrets, Daedalus, Medic Commander, Carrier,
+    and the Black Widow.
+  - 14 entirely new levels and 10 new deathmatch levels
+  - New power-ups -- deathmatch specific power-ups: Vengeance Sphere, Hunter
+    Sphere, and Anti-matter bomb
+  - New weapons -- The Chainsaw, ETF Rifle, and Plasma Beam
 
 This port installs the game.so file, but you still need the original data.
 
diff --git a/games/quake2-xatrix/Makefile b/games/quake2-xatrix/Makefile
index 84e4695bc357..57f25ef0cebb 100644
--- a/games/quake2-xatrix/Makefile
+++ b/games/quake2-xatrix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-xatrix
-# Date created:				26 Jul 2006
-# Whom:					alepulver
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xatrix
 PORTVERSION=	3.20
@@ -15,25 +11,17 @@ DISTNAME=	${PORTNAME}src${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Quake II: The Reckoning (Xatrix) Mission Pack
+COMMENT=	Quake II: The Reckoning (Xatrix) official mission pack
 
 NO_WRKSUBDIR=	yes
-
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
+SUB_FILES=	pkg-message
 
 PLIST_FILES=	%%Q2DIR%%/${PORTNAME}/game.so
 PLIST_DIRS=	%%Q2DIR%%/${PORTNAME}
 
-SUB_FILES=	pkg-message
-
-.include "${.CURDIR}/../quake2-data/Makefile.include"
-
-.include <bsd.port.pre.mk>
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		uncompress -c ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \
 		${TAIL} +441 | ${SH}
 
 post-extract:
@@ -43,7 +31,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]
 
 do-install:
-	${MKDIR} ${Q2DIR}/${PORTNAME}
+	@${MKDIR} ${Q2DIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
 
 post-install:
@@ -51,4 +39,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.mk>
diff --git a/games/quake2-xatrix/files/pkg-message.in b/games/quake2-xatrix/files/pkg-message.in
index 6f5c317c7f96..be69efac89d0 100644
--- a/games/quake2-xatrix/files/pkg-message.in
+++ b/games/quake2-xatrix/files/pkg-message.in
@@ -1,8 +1,8 @@
 ==============================================================================
 
 To complete the installation of this port you need to copy the file
-"xatrix/pak0.pak" and the directory "xatrix/video" with its contents from the
-original Quake II: The Reckoning (Xatrix) Mission Pack distribution to
-"%%Q2DIR%%/xatrix".
+"xatrix/pak0.pak" and the directory "xatrix/video" with its contents from
+the original Quake II: The Reckoning (Xatrix) mission pack distribution to
+%%Q2DIR%%/xatrix.
 
 ==============================================================================
diff --git a/games/quake2-xatrix/pkg-descr b/games/quake2-xatrix/pkg-descr
index 5c3476843d75..e20470523261 100644
--- a/games/quake2-xatrix/pkg-descr
+++ b/games/quake2-xatrix/pkg-descr
@@ -1,14 +1,15 @@
-Quake II: The Reckoning (Xatrix) Mission Pack.
+This is the first official Quake II expansion: The Reckoning (also known as
+Xatrix, as developed by Xatrix Entertainment).
 
-You are part of an elite commando foce that must infiltrate a hostile alien
-cite. Once inside, you must scour industrial landscapes, crawl through
+You are part of an elite commando force that must infiltrate a hostile alien
+cite.  Once inside, you must scour industrial landscapes, crawl through
 waterways and air ducts, navigate treacherous canyons teeming with vicious
-mutants, stow away on an alien spacecraft, and destroy the enemy's secret moon
-base.
+mutants, stow away on an alien spacecraft, and destroy the enemy's secret
+moon base.  This mission pack features:
 
-- 18 Arduous Levels to Conquer.
-- Added Weapons.
-- New Enemies.
+  - 18 arduous levels to conquer
+  - Added weapons
+  - New enemies
 
 This port installs the game.so file, but you still need the original data.