- Take maintainership.

- Update to version 1.41b.
- Remove '@' from install commands.

Approved by:	garga (mentor)

4 files changed, 41 insertions, 30 deletions

diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 9a737deea370..fd209be310d3 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -6,33 +6,35 @@
 #
 
 PORTNAME=	rtcw
-DISTVERSION=	1.41-3
+PORTVERSION=	1.41b
+PORTEPOCH=	1
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	wolf/linux
-DISTNAME=	wolf-linux-${DISTVERSION}.x86
+DISTNAME=	wolf-linux-${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Return to Castle Wolfenstein for Linux
 
 ONLY_FOR_ARCHS=	i386
-
 REINPLACE_ARGS=	-i ""
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
-
 PROGS=		wolf wolfded wolfsp
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && tail +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKDIR} && tail +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
+post-extract:
+	@${MV} ${WRKSRC}/pb/PB_EULA.txt ${WRKSRC}
+
+# Remove trailing ^M.
 pre-patch:
-	@# remove trailing ^M
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
 		-exec ${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" {} \;
@@ -40,29 +42,29 @@ pre-patch:
 do-build:
 .for f in ${PROGS}
 	@(${ECHO_CMD} "#!${SH}"; \
-		${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
-		${ECHO_CMD} "exec ./${f}") > ${WRKDIR}/${f}
+	  ${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
+	  ${ECHO_CMD} "exec ./${f}") > ${WRKDIR}/${f}
 .endfor
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}
 .for f in ${PROGS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f}.x86 ${DATADIR}/${f}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f}.x86 ${DATADIR}/${f}
+	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
 .endfor
 .for f in main pb
-	@${CP} -R ${WRKSRC}/${f} ${DATADIR}
+	${CP} -R ${WRKSRC}/${f} ${DATADIR}
 .endfor
-	@${MKDIR} ${PREFIX}/share/pixmaps
+	${MKDIR} ${PREFIX}/share/pixmaps
 .for f in WolfMP.xpm WolfSP.xpm
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/pixmaps
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.   for f in CHANGES INSTALL QUICKSTART RTCW-README-1.4.txt
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+.   for f in CHANGES INSTALL PB_EULA.txt QUICKSTART RTCW-README-1.4.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .   endfor
-	@${CP} -R ${WRKSRC}/Docs ${DOCSDIR}
+	${CP} -R ${WRKSRC}/Docs ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/games/rtcw/distinfo b/games/rtcw/distinfo
index d5cca3ebce6d..3ec74148c5f0 100644
--- a/games/rtcw/distinfo
+++ b/games/rtcw/distinfo
@@ -1,3 +1,3 @@
-MD5 (wolf-linux-1.41-3.x86.run) = 1db2a23a9548c8d84c8f9dbe87963842
-SHA256 (wolf-linux-1.41-3.x86.run) = 2c334aead8c89e446d4798717cf1577edd26d6820b8155f93d8e90d77d1b8e77
-SIZE (wolf-linux-1.41-3.x86.run) = 8513720
+MD5 (wolf-linux-1.41b.x86.run) = 2aa37968aff19d665ed6c001773b2de3
+SHA256 (wolf-linux-1.41b.x86.run) = 2921425c1b429147c1bc6f0c6a8664bec502ae86a2d6bccfaa1162f75dce89f3
+SIZE (wolf-linux-1.41b.x86.run) = 73940068
diff --git a/games/rtcw/files/pkg-message.in b/games/rtcw/files/pkg-message.in
index 78eb44dec3e4..86b81b070ed3 100644
--- a/games/rtcw/files/pkg-message.in
+++ b/games/rtcw/files/pkg-message.in
@@ -1,18 +1,16 @@
-============================================================
+==============================================================================
+
+Return to Castle Wolfenstein has been installed.
 
 To complete the installation of this port you need to copy
-the files "mp_pak0.pk3", "mp_pak1.pk3", "mp_pak2.pk3",
-"pak0.pk3", "sp_pak1.pk3" and "sp_pak2.pk3" (in the "main"
+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/mp_pak1.pk3) = 22b972974f499a237c96a2200b0d019e
-MD5 (%%DATADIR%%/main/mp_pak2.pk3) = 30f29ffa81748a957e0441af8c14cb56
 MD5 (%%DATADIR%%/main/pak0.pk3) = ce92b11df889cb0a045762bb5fd7cde5
 MD5 (%%DATADIR%%/main/sp_pak1.pk3) = a0d3fe956f85f40c8efd6babe0d09832
-MD5 (%%DATADIR%%/main/sp_pak2.pk3) = 330b272d5261fe19fcf3c3fbc943c7f3
 
-============================================================
+==============================================================================
diff --git a/games/rtcw/pkg-plist b/games/rtcw/pkg-plist
index 971561d9b864..8dfa97fd6efa 100644
--- a/games/rtcw/pkg-plist
+++ b/games/rtcw/pkg-plist
@@ -178,21 +178,32 @@ bin/wolfsp
 %%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
+%%DATADIR%%/main/mp_pak1.pk3
+%%DATADIR%%/main/mp_pak2.pk3
 %%DATADIR%%/main/mp_pak3.pk3
 %%DATADIR%%/main/mp_pak4.pk3
+%%DATADIR%%/main/mp_pak5.pk3
+%%DATADIR%%/main/mp_pakmaps0.pk3
+%%DATADIR%%/main/mp_pakmaps1.pk3
+%%DATADIR%%/main/mp_pakmaps2.pk3
+%%DATADIR%%/main/mp_pakmaps3.pk3
+%%DATADIR%%/main/mp_pakmaps4.pk3
+%%DATADIR%%/main/mp_pakmaps5.pk3
+%%DATADIR%%/main/mp_pakmaps6.pk3
 %%DATADIR%%/main/qagame.mp.i386.so
 %%DATADIR%%/main/qagamei386.so
 %%DATADIR%%/main/rotate.cfg
 %%DATADIR%%/main/scripts/translation.cfg
+%%DATADIR%%/main/sp_pak2.pk3
 %%DATADIR%%/main/sp_pak3.pk3
 %%DATADIR%%/main/ui.mp.i386.so
 %%DATADIR%%/main/uii386.so
-%%DATADIR%%/pb/PB_EULA.txt
 %%DATADIR%%/pb/htm/la001289.htm
 %%DATADIR%%/pb/htm/la001293.htm
 %%DATADIR%%/pb/htm/lc000989.htm