7 files changed, 293 insertions, 218 deletions

diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile
index 5b171083ed57..8a2a642df346 100644
--- a/games/quake2-data/Makefile
+++ b/games/quake2-data/Makefile
@@ -7,42 +7,49 @@
 
 PORTNAME=	data
 PORTVERSION=	3.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR=	quake2
+MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|:data,src|}
+MASTER_SITE_SUBDIR=	quake2/:data \
+			quake2/source/:src
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
-DISTFILES=	${Q2FULL}
-DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+DISTFILES=	${Q2_UPDATE}:data \
+		${Q2_SRC}:src
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Quake II data files
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
-
-NO_BUILD=	yes
+USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	CTF "Install the Capture The Flag mod data" on \
-		SHAREWARE "Install demo version game data" off
-
-DATADIR=	${Q2DIR}
+OPTIONS=	MANUAL "Install game manual" off \
+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+		SHAREWARE "Install demo version of the game data" off
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
+DATADIR=	${Q2DIR}
+DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
-Q2FULL=		q2-3.20-x86-full.exe
-Q2DEMO=		q2-314-demo-x86.exe
-Q2CTF=		ctf/q2ctf150.zip
+Q2_DEMO=	q2-314-demo-x86.exe
+Q2_SRC=		q2src${PORTVERSION:S/.//}.shar.Z
+Q2_UPDATE=	q2-${PORTVERSION}-x86-full.exe
 
 .include "Makefile.include"
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_CTF) && !defined(WITH_SHAREWARE)
-DISTFILES+=	${Q2CTF}
-PLIST_SUB+=	CTF=""
+.if defined(WITH_MANUAL) || defined(WITH_SHAREWARE)
+DISTFILES+=	${Q2_DEMO}
+.endif
+
+.if defined(WITH_MANUAL)
+PLIST_SUB+=	MANUAL=""
 .else
-PLIST_SUB+=	CTF="@comment "
+PLIST_SUB+=	MANUAL="@comment "
+.endif
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+MAKE_ENV+=	WITH_OPTIMIZED_CFLAGS=yes
 .endif
 
 .if defined(WITH_SHAREWARE)
@@ -55,53 +62,35 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 .endif
 
-.if defined(WITH_SHAREWARE) || !defined(NOPORTDOCS)
-DISTFILES+=	${Q2DEMO}
-.endif
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
+	@cd ${WRKDIR} && \
+		uncompress -c ${DISTDIR}/${Q2_SRC} | ${TAIL} +434 | ${SH}
 	@${UNZIP_CMD} -q -d ${WRKDIR} \
-		${DISTDIR}/${DIST_SUBDIR}/${Q2FULL} \
-		baseq2/* -x *.dll
-.if defined(WITH_SHAREWARE)
-	@${RM} ${WRKDIR}/baseq2/pak[^0].pak
-.endif
-.if !defined(WITHOUT_CTF) && !defined(WITH_SHAREWARE)
-	@${UNZIP_CMD} -aq -d ${WRKDIR}/ctf \
-		${DISTDIR}/${DIST_SUBDIR}/${Q2CTF} \
-		-x *.dll *.ico
-.endif
-.if !defined(NOPORTDOCS)
+		${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll
+.if defined(WITH_MANUAL)
 	@${UNZIP_CMD} -ajq -d ${WRKDIR}/DOCS \
-		${DISTDIR}/${DIST_SUBDIR}/${Q2DEMO} \
-		Install/Data/DOCS/*
+		${DISTDIR}/${Q2_DEMO} Install/Data/DOCS/\*
 .endif
 .if defined(WITH_SHAREWARE)
+	@${RM} ${WRKDIR}/baseq2/pak[^0].pak
 	@${UNZIP_CMD} -jq -d ${WRKDIR}/baseq2 \
-		${DISTDIR}/${DIST_SUBDIR}/${Q2DEMO} \
-		Install/Data/baseq2/pak0.pak
+		${DISTDIR}/${Q2_DEMO} Install/Data/baseq2/pak0.pak
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]
+
 do-install:
-	@${MKDIR} ${DATADIR}
-	@${CP} -R ${WRKSRC}/baseq2 ${DATADIR}
-.if !defined(WITH_SHAREWARE)
-	@${MKDIR} ${DATADIR}/rogue ${DATADIR}/xatrix
-.endif
-.if !defined(WITHOUT_CTF) && !defined(WITH_SHAREWARE)
-	@${MKDIR} ${DATADIR}/ctf
-.   for f in *.cfg *.pak
-	@${INSTALL_DATA} ${WRKSRC}/ctf/${f} ${DATADIR}/ctf
-.   endfor
-.endif
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${DATADIR}/baseq2
+	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${DATADIR}/baseq2
+	${CP} -R ${WRKSRC}/baseq2/* ${DATADIR}/baseq2
+.if defined(WITH_MANUAL)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -R ${WRKSRC}/DOCS ${DOCSDIR}/manual
-.   if !defined(WITHOUT_CTF) && !defined(WITH_SHAREWARE)
-	@${MKDIR} ${DOCSDIR}/ctf
-	@${INSTALL_DATA} ${WRKSRC}/ctf/*.txt ${DOCSDIR}/ctf
-.   endif
 .endif
 
 post-install:
diff --git a/games/quake2-data/Makefile.include b/games/quake2-data/Makefile.include
index afdc3ba1f537..2a6b97096681 100644
--- a/games/quake2-data/Makefile.include
+++ b/games/quake2-data/Makefile.include
@@ -1,11 +1,55 @@
-# Makefile for defining variables used by other Quake II related ports.
+# Makefile for defining variables used by Quake II related ports.
+#
+# A dependency to "games/quake2-data" is automatically added (except for the
+# data port itself). The ports using this definitions should assume the data
+# is installed (i.e. no need for pkg-message asking to copy the .pak files),
+# and the main game.so (except the engine incompatible with the original one).
+#
+# The following variables are defined, and can be used in the port.
+# Q2PKGNAMEPREFIX	- The package name prefix for Quake II additions.
+# Q2DIR			- The Quake II data directory (also added to MAKE_ENV,
+#			  PLIST_SUB and SUB_LIST).
+#
+# The following are some notes for making this kind of ports.
+# - The game engines should be modified to add ${Q2DIR} as the first search
+#   path (it's a stack so new paths override previous ones), and add
+#   "~/.${PORTNAME}" as the last one (this is where it writes the
+#   configuration, saved games, etc.), which may need to be created if doesn't
+#   exist.
+# - If the engine needs to load additional data (renderers, pak files, etc.)
+#   don't install it in ${Q2DIR}, use ${PREFIX}/lib/${PORTNAME} instead and
+#   add that directory to the search paths immediatly after ${Q2DIR}.
+# - The reason to use "~/.${PORTNAME}" for writing is in the case the program
+#   isn't compatible with the original engine (e.g. new console variables,
+#   different saved game format, etc.). If just the configuration is
+#   different it can write in "~/.quake2" but use a different configuration
+#   file name (not config.cfg).
+# - Search path summary (ordered):
+#   - cddir		- Directory to be prepended (optional, configurable).
+#   - ${Q2DIR}		- Base shared data directory.
+#   - ${LIBDIR}		- Program specific data directory (optional).
+#   - basedir		- Base data directory (configurable).
+#   - "~/.${PORTNAME}"	- Writing directory.
+# - The "game${ARCH}.so" in game engines and modifications should be changed
+#   to just "game.so" (the ${ARCH} can cause incompatibilities with new
+#   platforms and is unnecessary).
+# - The modifications and data which is common to all the engines should be
+#   installed in ${Q2DIR}.
+# - The engines should not install game.so files for the normal game, CTF,
+#   Rogue, Xatrix, and all other which exist as a separate port. If the
+#   version the engine provides is different than the original one then add it
+#   as an option (off by default). If the engine is not compatible with the
+#   game.so files provided by the ports then ignore this rule.
+#
+# For examples see the existing ports.
+#
 
 # Set variables.
 
 Q2PKGNAMEPREFIX?=quake2-
 Q2DIR?=		${LOCALBASE}/share/quake2
 
-# Add them to the environment.
+# Add them to the ports system.
 
 MAKE_ENV+=	Q2DIR="${Q2DIR}"
 PLIST_SUB+=	Q2DIR="${Q2DIR:S/${LOCALBASE}\///}"
diff --git a/games/quake2-data/distinfo b/games/quake2-data/distinfo
index 63af8265bbda..479a9c167806 100644
--- a/games/quake2-data/distinfo
+++ b/games/quake2-data/distinfo
@@ -1,9 +1,6 @@
-MD5 (quake2-data/q2-3.20-x86-full.exe) = c5a1c2878c2e88fa576b7afb26b411e4
-SHA256 (quake2-data/q2-3.20-x86-full.exe) = ee1b430258d5fc5a897ef47c6246f5da11de885f4c29fbeca005ff27924700be
-SIZE (quake2-data/q2-3.20-x86-full.exe) = 13842432
-MD5 (quake2-data/ctf/q2ctf150.zip) = 89218caf5950b17663d4f81df7e8f893
-SHA256 (quake2-data/ctf/q2ctf150.zip) = 5e85db1bff51aa53e12307bd3251aa4b507b5a7a47004a862d8ae3777c5a87c1
-SIZE (quake2-data/ctf/q2ctf150.zip) = 9559697
-MD5 (quake2-data/q2-314-demo-x86.exe) = 4d1cd4618e80a38db59304132ea0856c
-SHA256 (quake2-data/q2-314-demo-x86.exe) = 7ace5a43983f10d6bdc9d9b6e17a1032ba6223118d389bd170df89b945a04a1e
-SIZE (quake2-data/q2-314-demo-x86.exe) = 39015499
+MD5 (q2-3.20-x86-full.exe) = c5a1c2878c2e88fa576b7afb26b411e4
+SHA256 (q2-3.20-x86-full.exe) = ee1b430258d5fc5a897ef47c6246f5da11de885f4c29fbeca005ff27924700be
+SIZE (q2-3.20-x86-full.exe) = 13842432
+MD5 (q2src320.shar.Z) = 529314a12b806459c58dc9e40828059b
+SHA256 (q2src320.shar.Z) = fc580dd9259a007ec3a714ec1c1140c0ced46765978eb3cbde60a25af4132862
+SIZE (q2src320.shar.Z) = 392383
diff --git a/games/quake2-data/files/Makefile b/games/quake2-data/files/Makefile
new file mode 100644
index 000000000000..a72cbadbc950
--- /dev/null
+++ b/games/quake2-data/files/Makefile
@@ -0,0 +1,63 @@
+# $FreeBSD$
+
+SHLIB=		game
+SHLIB_NAME=	game.so
+
+SRCS=		g_ai.c \
+		g_chase.c \
+		g_cmds.c \
+		g_combat.c \
+		g_func.c \
+		g_items.c \
+		g_main.c \
+		g_misc.c \
+		g_monster.c \
+		g_phys.c \
+		g_save.c \
+		g_spawn.c \
+		g_svcmds.c \
+		g_target.c \
+		g_trigger.c \
+		g_turret.c \
+		g_utils.c \
+		g_weapon.c \
+		m_actor.c \
+		m_berserk.c \
+		m_boss2.c \
+		m_boss3.c \
+		m_boss31.c \
+		m_boss32.c \
+		m_brain.c \
+		m_chick.c \
+		m_flash.c \
+		m_flipper.c \
+		m_float.c \
+		m_flyer.c \
+		m_gladiator.c \
+		m_gunner.c \
+		m_hover.c \
+		m_infantry.c \
+		m_insane.c \
+		m_medic.c \
+		m_move.c \
+		m_mutant.c \
+		m_parasite.c \
+		m_soldier.c \
+		m_supertank.c \
+		m_tank.c \
+		p_client.c \
+		p_hud.c \
+		p_trail.c \
+		p_view.c \
+		p_weapon.c \
+		q_shared.c
+
+CFLAGS+=	-Dstricmp=strcasecmp
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-ffast-math -funroll-loops -fomit-frame-pointer \
+		-fexpensive-optimizations
+.endif
+
+LDFLAGS+=	-L/lib -L/usr/lib -lm
+
+.include <bsd.lib.mk>
diff --git a/games/quake2-data/files/pkg-message.in b/games/quake2-data/files/pkg-message.in
index 4d8302acad1c..367d30879069 100644
--- a/games/quake2-data/files/pkg-message.in
+++ b/games/quake2-data/files/pkg-message.in
@@ -1,17 +1,7 @@
-====================================================================
+==============================================================================
 
 To complete the installation of this port you need to copy the file
 "baseq2/pak0.pak" from the original Quake II distribution to
 "%%DATADIR%%/baseq2".
 
-If you have the "Ground Zero" (Rogue) mission pack copy the file
-"rogue/pak0.pak" and the directory "rogue/video" from the original
-Quake II: Ground Zero distribution to
-"%%DATADIR%%/rogue".
-
-If you have "The Reckoning" (Xatrix) mission pack copy the file
-"xatrix/pak0.pak" and the directory "xatrix/video" from the original
-Quake II: The Reckoning distribution to
-"%%DATADIR%%/xatrix".
-
-====================================================================
+==============================================================================
diff --git a/games/quake2-data/pkg-descr b/games/quake2-data/pkg-descr
index 37b96f624d2d..c8876984219c 100644
--- a/games/quake2-data/pkg-descr
+++ b/games/quake2-data/pkg-descr
@@ -1,7 +1,6 @@
-Quake II data files.
+This port installs the data files needed to run Quake II: the updates for the
+original game, or the demo (shareware) data if requested. In the first case
+you need to have a legitimate copy of the game in order to obtain the pak0.pak
+file.
 
-This port installs the data files needed to run Quake II. It installs the
-updates and Capture The Flag mod data.
-
-You still need to have a legitimate copy of the game in order to obtain
-the .pak files. Otherwise you can use the shareware version of the game data.
+WWW: http://www.idsoftware.com/games/quake/quake2/
diff --git a/games/quake2-data/pkg-plist b/games/quake2-data/pkg-plist
index 779fadba2c5f..377ba41ad903 100644
--- a/games/quake2-data/pkg-plist
+++ b/games/quake2-data/pkg-plist
@@ -1,4 +1,5 @@
 %%DATADIR%%/baseq2/maps.lst
+%%DATADIR%%/baseq2/game.so
 %%SHAREWARE%%%%DATADIR%%/baseq2/pak0.pak
 %%FULL%%%%DATADIR%%/baseq2/pak1.pak
 %%FULL%%%%DATADIR%%/baseq2/pak2.pak
@@ -200,145 +201,137 @@
 %%DATADIR%%/baseq2/players/male/w_sshotgun.md2
 %%DATADIR%%/baseq2/players/male/weapon.md2
 %%DATADIR%%/baseq2/players/male/weapon.pcx
-%%CTF%%%%DATADIR%%/ctf/pak0.pak
-%%CTF%%%%DATADIR%%/ctf/pak1.pak
-%%CTF%%%%DATADIR%%/ctf/server.cfg
-%%CTF%%%%PORTDOCS%%%%DOCSDIR%%/ctf/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/Manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/adrenaline.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/amor_body.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/armor_combat.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/armor_jacket.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/armor_shard.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/bandoleer.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/barracuda_shark.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/berserker.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/bfg.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/blaster.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/bluekey.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/bottom.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/bottom_id_link_transparent.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/brains.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/breather.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/bullets.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/buttons.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/cells.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/chaingun.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/commandant_james.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/credits.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/credits_main.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/customer_support.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/door.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/elevator_base_exit_sign.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_barracuda_shark.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_berserker.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_brains.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_enforcer.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_flyer.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_gladiator.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_groupshot.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_gunner.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_icarus.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_iron_maiden.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_light_guard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_machinegun_guard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_medic.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_mutant.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_parasite.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_shotgun_guard.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_tank.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_tank_commander.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/enemy_technician.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/energy_armour.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/enforcer.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/envirosuit.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/explosive_barrels.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/first_aid.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/flyer.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/gladiator.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/grenade_launcher.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/grenades.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/gunner.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/hand_grenade.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/heavy_pack.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/hyper_blaster.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/icarus.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/intel_brief_enemy.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/invulnerability.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/iron_maiden.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/lava.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/lever.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/light_guard.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/machinegun.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/machinegun_guard.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/main.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/main_cover_image.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual_back.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual_bottom.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual_cover_image.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual_top.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/medic.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/medkit.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/mega_health.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/menu.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/multiplayer.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/multiplayer_main.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/multiplayer_menu1.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/multiplayer_screen1.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/mutant.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/no_data.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/options_menu.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/page_index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/parasite.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/player_properties_screen1.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/quad_damage.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/rail_gun.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/release.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/rocket_launcher.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/rockets.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/secret_door.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/setup_controls_screenmenus.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/shells.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/shotgun.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/shotgun_guard.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/silencer.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/slime.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/start_network_server_screen1.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/stimpack.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/story.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/story_main.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/strogg_environ_1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/strogg_environ_2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/strogg_environ_3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/supershotgun.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/tank.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/tank_commander.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/technical_information.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/technician.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/top_nav.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/top_nav_imagemap.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/unit_exit_door.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/water.jpg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%CTF%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ctf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CTF%%@dirrm %%DATADIR%%/ctf
+%%MANUAL%%%%DOCSDIR%%/manual/Manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/adrenaline.gif
+%%MANUAL%%%%DOCSDIR%%/manual/amor_body.gif
+%%MANUAL%%%%DOCSDIR%%/manual/armor_combat.gif
+%%MANUAL%%%%DOCSDIR%%/manual/armor_jacket.gif
+%%MANUAL%%%%DOCSDIR%%/manual/armor_shard.gif
+%%MANUAL%%%%DOCSDIR%%/manual/bandoleer.gif
+%%MANUAL%%%%DOCSDIR%%/manual/barracuda_shark.gif
+%%MANUAL%%%%DOCSDIR%%/manual/berserker.gif
+%%MANUAL%%%%DOCSDIR%%/manual/bfg.gif
+%%MANUAL%%%%DOCSDIR%%/manual/blaster.gif
+%%MANUAL%%%%DOCSDIR%%/manual/bluekey.gif
+%%MANUAL%%%%DOCSDIR%%/manual/bottom.html
+%%MANUAL%%%%DOCSDIR%%/manual/bottom_id_link_transparent.gif
+%%MANUAL%%%%DOCSDIR%%/manual/brains.gif
+%%MANUAL%%%%DOCSDIR%%/manual/breather.gif
+%%MANUAL%%%%DOCSDIR%%/manual/bullets.gif
+%%MANUAL%%%%DOCSDIR%%/manual/buttons.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/cells.gif
+%%MANUAL%%%%DOCSDIR%%/manual/chaingun.gif
+%%MANUAL%%%%DOCSDIR%%/manual/commandant_james.gif
+%%MANUAL%%%%DOCSDIR%%/manual/credits.html
+%%MANUAL%%%%DOCSDIR%%/manual/credits_main.gif
+%%MANUAL%%%%DOCSDIR%%/manual/customer_support.html
+%%MANUAL%%%%DOCSDIR%%/manual/door.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/elevator_base_exit_sign.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_barracuda_shark.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_berserker.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_brains.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_enforcer.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_flyer.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_gladiator.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_groupshot.gif
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_gunner.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_icarus.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_iron_maiden.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_light_guard.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_machinegun_guard.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_medic.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_mutant.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_parasite.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_shotgun_guard.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_tank.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_tank_commander.html
+%%MANUAL%%%%DOCSDIR%%/manual/enemy_technician.html
+%%MANUAL%%%%DOCSDIR%%/manual/energy_armour.gif
+%%MANUAL%%%%DOCSDIR%%/manual/enforcer.gif
+%%MANUAL%%%%DOCSDIR%%/manual/envirosuit.gif
+%%MANUAL%%%%DOCSDIR%%/manual/explosive_barrels.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/first_aid.gif
+%%MANUAL%%%%DOCSDIR%%/manual/flyer.gif
+%%MANUAL%%%%DOCSDIR%%/manual/gladiator.gif
+%%MANUAL%%%%DOCSDIR%%/manual/grenade_launcher.gif
+%%MANUAL%%%%DOCSDIR%%/manual/grenades.gif
+%%MANUAL%%%%DOCSDIR%%/manual/gunner.gif
+%%MANUAL%%%%DOCSDIR%%/manual/hand_grenade.gif
+%%MANUAL%%%%DOCSDIR%%/manual/heavy_pack.gif
+%%MANUAL%%%%DOCSDIR%%/manual/hyper_blaster.gif
+%%MANUAL%%%%DOCSDIR%%/manual/icarus.gif
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief2.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief3.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief4.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief5.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief6.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief7.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief8.html
+%%MANUAL%%%%DOCSDIR%%/manual/intel_brief_enemy.html
+%%MANUAL%%%%DOCSDIR%%/manual/invulnerability.gif
+%%MANUAL%%%%DOCSDIR%%/manual/iron_maiden.gif
+%%MANUAL%%%%DOCSDIR%%/manual/lava.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/lever.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/license.txt
+%%MANUAL%%%%DOCSDIR%%/manual/light_guard.gif
+%%MANUAL%%%%DOCSDIR%%/manual/machinegun.gif
+%%MANUAL%%%%DOCSDIR%%/manual/machinegun_guard.gif
+%%MANUAL%%%%DOCSDIR%%/manual/main.html
+%%MANUAL%%%%DOCSDIR%%/manual/main_cover_image.gif
+%%MANUAL%%%%DOCSDIR%%/manual/manual_back.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/manual_bottom.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/manual_cover_image.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/manual_top.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/medic.gif
+%%MANUAL%%%%DOCSDIR%%/manual/medkit.gif
+%%MANUAL%%%%DOCSDIR%%/manual/mega_health.gif
+%%MANUAL%%%%DOCSDIR%%/manual/menu.gif
+%%MANUAL%%%%DOCSDIR%%/manual/multiplayer.html
+%%MANUAL%%%%DOCSDIR%%/manual/multiplayer_main.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/multiplayer_menu1.gif
+%%MANUAL%%%%DOCSDIR%%/manual/multiplayer_screen1.gif
+%%MANUAL%%%%DOCSDIR%%/manual/mutant.gif
+%%MANUAL%%%%DOCSDIR%%/manual/no_data.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/options_menu.gif
+%%MANUAL%%%%DOCSDIR%%/manual/page_index.html
+%%MANUAL%%%%DOCSDIR%%/manual/parasite.gif
+%%MANUAL%%%%DOCSDIR%%/manual/player_properties_screen1.gif
+%%MANUAL%%%%DOCSDIR%%/manual/quad_damage.gif
+%%MANUAL%%%%DOCSDIR%%/manual/rail_gun.gif
+%%MANUAL%%%%DOCSDIR%%/manual/readme.txt
+%%MANUAL%%%%DOCSDIR%%/manual/release.txt
+%%MANUAL%%%%DOCSDIR%%/manual/rocket_launcher.gif
+%%MANUAL%%%%DOCSDIR%%/manual/rockets.gif
+%%MANUAL%%%%DOCSDIR%%/manual/secret_door.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/setup_controls_screenmenus.html
+%%MANUAL%%%%DOCSDIR%%/manual/shells.gif
+%%MANUAL%%%%DOCSDIR%%/manual/shotgun.gif
+%%MANUAL%%%%DOCSDIR%%/manual/shotgun_guard.gif
+%%MANUAL%%%%DOCSDIR%%/manual/silencer.gif
+%%MANUAL%%%%DOCSDIR%%/manual/slime.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/start_network_server_screen1.gif
+%%MANUAL%%%%DOCSDIR%%/manual/stimpack.gif
+%%MANUAL%%%%DOCSDIR%%/manual/story.html
+%%MANUAL%%%%DOCSDIR%%/manual/story_main.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/strogg_environ_1.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/strogg_environ_2.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/strogg_environ_3.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/supershotgun.gif
+%%MANUAL%%%%DOCSDIR%%/manual/tank.gif
+%%MANUAL%%%%DOCSDIR%%/manual/tank_commander.gif
+%%MANUAL%%%%DOCSDIR%%/manual/technical_information.html
+%%MANUAL%%%%DOCSDIR%%/manual/technician.gif
+%%MANUAL%%%%DOCSDIR%%/manual/top_nav.html
+%%MANUAL%%%%DOCSDIR%%/manual/top_nav_imagemap.gif
+%%MANUAL%%%%DOCSDIR%%/manual/unit_exit_door.jpg
+%%MANUAL%%%%DOCSDIR%%/manual/water.jpg
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual
+%%MANUAL%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/baseq2/players/male
 @dirrm %%DATADIR%%/baseq2/players/female
 @dirrm %%DATADIR%%/baseq2/players/cyborg
 @dirrm %%DATADIR%%/baseq2/players/crakhor
 @dirrm %%DATADIR%%/baseq2/players
 @dirrmtry %%DATADIR%%/baseq2
-@dirrmtry %%DATADIR%%/rogue
-@dirrmtry %%DATADIR%%/xatrix
 @unexec rmdir %D/%%DATADIR%% 2>/dev/null || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt