- Trim Makefile header (convert to the new form)

- Rephrase COMMENT line text a bit
- Do not try to set UNMAKESELF_CMD (after ports/118749 was closed)
- Mute ${MKDIR}'s, unmute build stage commands (wrappers generation)
- Consistently use -a switch when ${CP}'ing stuff; this also preserves mtimes
- Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS; utilize PORTDOCS to shorten
  pkg-plist considerably
- Do not advise to install retail version files into ${DATADIR}: the game
  knows also looks inside user's ${HOME}/.wolf/main directory; this also
  simplifies pkg-plist logic (no need for special checks via @unexec rmdir
  %D/%%DATADIR%% command) and allows not to mess manually with the files
  under system-wide ${DATADIR}; update pkg-message accordingly and reindent
- Due to previous change, pkg-message no longer requires %%DATADIR%%
  substitution, and thus can be moved out from files/ directory
- Slightly retouch port description and update WWW: to point to a working
  webpage [www.idsoftware.com]

5 files changed, 41 insertions, 244 deletions

diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 471651b022ab..8b0c936844ba 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Return to Castle Wolfenstein
-# Date created:				Sun Jun  3 00:52:38 EDT 2001
-# Whom:					nik@freebsd.org
-#
+# Created by: Nik Clayton <nik@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rtcw
 PORTVERSION=	1.41b
@@ -15,46 +11,49 @@ MASTER_SITE_SUBDIR=	wolf/linux
 DISTNAME=	wolf-linux-${PORTVERSION}.x86
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Return to Castle Wolfenstein for Linux
+COMMENT=	Return to Castle Wolfenstein (Linux version)
 
 USE_MAKESELF=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	dri xorglibs
 NO_WRKSUBDIR=	yes
 
-SUB_FILES=	pkg-message
 WRAPPERS=	wolf wolfded wolfsp
 
-# Ignore older version which seems to be newer.
+# Ignore older version which seems to be newer
 PORTSCOUT=	skipv:1.41-3
 
-# Should be in bsd.commands.mk. Remove when ports/118749 is committed.
-UNMAKESELF_CMD?=	${LOCALBASE}/bin/unmakeself
+PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+# XXX: should probably be converted to use the LICENSE framework
 post-extract:
 	@${MV} ${WRKSRC}/pb/PB_EULA.txt ${WRKSRC}
 
 do-build:
 .for f in ${WRAPPERS}
-	@(${ECHO_CMD} "#!${SH}"; \
-	  ${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
-	  ${ECHO_CMD} 'exec ./${f} "$$@"') > ${WRKDIR}/${f}
+	(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD}; \
+	 ${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
+	 ${ECHO_CMD} 'exec ./${f} "$$@"') > ${WRKDIR}/${f}
 .endfor
 
 do-install:
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${DATADIR}
 .for f in ${WRAPPERS}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f}.x86 ${DATADIR}/${f}
 	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
 .endfor
-	${CP} -r ${WRKSRC}/main ${WRKSRC}/pb ${DATADIR}
-	${MKDIR} ${PREFIX}/share/pixmaps
+	${CP} -a ${WRKSRC}/main ${WRKSRC}/pb ${DATADIR}
+	@${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/Wolf[MS]P.xpm ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} CHANGES INSTALL QUICKSTART *.txt ${DOCSDIR}
-	${CP} -R ${WRKSRC}/Docs ${DOCSDIR}
+	${CP} -a ${WRKSRC}/Docs ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/games/rtcw/files/pkg-message.in b/games/rtcw/files/pkg-message.in
deleted file mode 100644
index 86b81b070ed3..000000000000
--- a/games/rtcw/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-==============================================================================
-
-Return to Castle Wolfenstein has been installed.
-
-To complete the installation of this port you need to copy
-the files "mp_pak0.pk3", "pak0.pk3", and "sp_pak1.pk3" (in the "main"
-subdirectory) from your RTCW distribution to
-"%%DATADIR%%/main".
-
-Below is the list of pk3 files, including their MD5 checksums:
-
-MD5 (%%DATADIR%%/main/mp_pak0.pk3) = 62641cffd9a8ad0f62cc1cca867d51f8
-MD5 (%%DATADIR%%/main/pak0.pk3) = ce92b11df889cb0a045762bb5fd7cde5
-MD5 (%%DATADIR%%/main/sp_pak1.pk3) = a0d3fe956f85f40c8efd6babe0d09832
-
-==============================================================================
diff --git a/games/rtcw/pkg-descr b/games/rtcw/pkg-descr
index 1741d0b47c3f..47e643aa78d1 100644
--- a/games/rtcw/pkg-descr
+++ b/games/rtcw/pkg-descr
@@ -1,9 +1,10 @@
-Return to Castle Wolfenstein is a remake of sorts of the early, seminal
+Return to Castle Wolfenstein is a remake of sorts of the id's early, seminal
 first-person shooter, Wolfenstein 3D. However, with the advances in graphics
 technology and gameplay design since the original game, without the name and
-the occasional in-game references, it would be unrecognisable as a remake.
+the occasional in-game references, it would be unrecognizable as a remake.
+
 Unlike the original Wolfenstein 3D, only a handful of the single player
-missions in Return to Castle Wolfenstein takes place in the infamous
-castle/prison.
+missions in Return to Castle Wolfenstein takes place in the infamous castle
+and prison.
 
-WWW: http://www.castlewolfenstein.com/
+WWW: http://www.idsoftware.com/games/wolfenstein/rtcw/
diff --git a/games/rtcw/pkg-message b/games/rtcw/pkg-message
new file mode 100644
index 000000000000..1dac7d4050fb
--- /dev/null
+++ b/games/rtcw/pkg-message
@@ -0,0 +1,15 @@
+==============================================================================
+
+   Linux version of Return to Castle Wolfenstein has been installed.
+
+   To be able to play the game, you need to copy the files "mp_pak0.pk3",
+   "pak0.pk3", and "sp_pak1.pk3" from the RtCW distribution (in the "main"
+   subdirectory) to your $HOME/.wolf/main directory.
+
+   Below is the list of required packfiles, with their MD5 checksums:
+
+   MD5 (main/mp_pak0.pk3) = 62641cffd9a8ad0f62cc1cca867d51f8
+   MD5 (main/pak0.pk3) = ce92b11df889cb0a045762bb5fd7cde5
+   MD5 (main/sp_pak1.pk3) = a0d3fe956f85f40c8efd6babe0d09832
+
+==============================================================================
diff --git a/games/rtcw/pkg-plist b/games/rtcw/pkg-plist
index 2c9cbdb51f83..c586a4407328 100644
--- a/games/rtcw/pkg-plist
+++ b/games/rtcw/pkg-plist
@@ -1,186 +1,6 @@
 bin/wolf
 bin/wolfded
 bin/wolfsp
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/Docs/ATVIsmall.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Dedicated Server Notes.html
-%%PORTDOCS%%%%DOCSDIR%%/Docs/GM_Color_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Compatibility/msr.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/Activision.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/Additional.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/Default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/gray_matter_credits.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/id_software_credits.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Credits/nerve_software_credits.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/Default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/Images/Title.1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/Images/mp_HUD.JPG
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/Images/sp_hud.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_EN/Title.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_EN/default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_EN/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_EN/toc.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_FR/Title.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_FR/default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_FR/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_FR/toc.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_GM/Title.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_GM/default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_GM/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_GM/toc.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_IT/Title.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_IT/default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_IT/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_IT/toc.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_SP/Title.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_SP/default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_SP/text.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_SP/toc.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Readme/readme.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Customer Support/Customer_Support.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Default.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/Audio_Problems.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/DirectX.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/Electronic_Registration.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/Installing_the_game_to_a_compressed_hard_drive.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/RTCW_dedicated_serv.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/Sound_Card_Conflicts.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/Updates_and_or_Patches.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/Information/autoplay.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/3Dfx.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/ATI_Technologies_Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Acer_America.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Advanced_Gravis.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Asus.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Aztech_Labs.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Boca_Research_Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/CD_ROM_Drive_Manufacturers_List.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/CSS_Laboratories__Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Canopus_Corporation.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Cardinal_Technologies.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Cirrus_Logic.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Colorgraphic_Communication.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Compaq_Computer_Corporation.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Creative_Labs.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Dell_Computers.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Diamond_Multimedia_Systems.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Epson_America.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Gateway_2000.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Hercules_Computer_Technology_Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Hitachi.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/IBM__International_Business_Machines_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Intel_Corp_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Logitech.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Matrox_Graphics_Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Media_Vision.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Microsoft.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Mitsubishi.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Mitsumi.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/NEC.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Number_Nine_Visual_Technology.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Oak_Technology.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Packard_Bell.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Panasonic_Interactive_Media.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Paradise__Phillips_Electronics.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Real_Magic.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Rendition.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/STB_Systems__Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Sigma_Designs.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Sonic_Blue.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Sony.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Sound_Card_Manufacturers_List.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Swan_Technologies__Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/System_Manufacturers_List.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Tandy_Computer.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Teac.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Toshiba.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Trident_Microsystems_Inc_.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Tseng_Labs.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Turtle_Beach.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Video_Card_Manufacturers_List.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Willow_Peripherals.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/Zenith_Data_Systems.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/nVidia.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/Tech Help/vendor/vendor.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/_borders/left.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/_borders/side_ie.css
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/_borders/style_ie.css
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/_borders/top.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/3by3.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/ATVIsmall.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/GM_Color_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/id_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/nerve_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/redstripe.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/rtcw_logo_480banner_elite.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/rtcw_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/images/wolf_bg.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Help/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/License.txt
-%%PORTDOCS%%%%DOCSDIR%%/Docs/MP1_readme.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/MSR.txt
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tabout1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tadvanced1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tbasics1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tcommands1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tcommands2.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tenabling1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tfaq1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tgame1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tintro1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tmonitoring1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tpbint1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tpbsub1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tplayer1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tquick1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tremote1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tscreen1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tsettings1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/ttitle1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/ttoc1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/admins/tupdating1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/sbrowser1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/skeyboard1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/stilde1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tabout1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tbasics1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tbutton1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tbutton2.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tcommands1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tcommands2.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tenabling1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tfaq1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tfinding1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tgame1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tintro1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tmonitoring1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tname1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tpbint1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tpbsub1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tquick1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tremote1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tscreen1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tsettings1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/ttaking1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/ttitle1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/ttoc1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tupdating1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/PunkBuster/players/tusing1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Return To Castle Wolfenstein Website.url
-%%PORTDOCS%%%%DOCSDIR%%/Docs/Update_readme.htm
-%%PORTDOCS%%%%DOCSDIR%%/Docs/id_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/nerve_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Docs/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/Docs/rtcw_logo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/PB_EULA.txt
-%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
-%%PORTDOCS%%%%DOCSDIR%%/RTCW-README-1.4.txt
 %%DATADIR%%/main/cgame.mp.i386.so
 %%DATADIR%%/main/cgamei386.so
 %%DATADIR%%/main/mp_bin.pk3
@@ -233,27 +53,5 @@ share/pixmaps/WolfSP.xpm
 @dirrm %%DATADIR%%/pb/htm
 @dirrm %%DATADIR%%/pb
 @dirrm %%DATADIR%%/main/scripts
-@dirrmtry %%DATADIR%%/main
-@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/players
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/admins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/_borders
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Tech Help/vendor
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Tech Help/Information
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Tech Help/Customer Support
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Tech Help
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Readme
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_SP
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_IT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_GM
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_FR
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/RTCW_Manual_EN
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual/Images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Credits
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help/Compatibility
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/Help
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/main
+@dirrm %%DATADIR%%