4 files changed, 38 insertions, 13 deletions

diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 1aae50f04f70..ede1dd386e22 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	doom3
-PORTVERSION=	1.3.1302
-PORTREVISION=	2
+PORTVERSION=	1.3.1.1304
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR=	doom3/linux/old
+MASTER_SITE_SUBDIR=	doom3/linux
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
@@ -18,7 +17,6 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Doom III for Linux
 
-IA32_BINARY_PORT=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 NO_CDROM=	Redistribution is limited, see license
@@ -32,13 +30,8 @@ SUB_FILES=	doom3 doom3-ded pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
-.endif
-
 .if defined(WITH_NO_CDKEY)
+MASTER_SITE_SUBDIR=	doom3/linux/old
 PORTVERSION=	1.1.1286
 PLIST_SUB+=	NEW="@comment "
 .else
@@ -50,12 +43,23 @@ do-extract:
 	@cd ${WRKDIR} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
+.if !defined(WITH_NO_CDKEY)
+post-extract:
+	@${RM} ${WRKSRC}/pb/PB_EULA.txt
+.endif
+
 do-install:
 	${MKDIR} ${DATADIR}/base
 	cd ${WRKSRC}/base && \
 		${INSTALL_DATA} game01.pk4 pak*.pk4 ${DATADIR}/base
 	cd ${WRKSRC}/bin/Linux/x86 && \
 		${INSTALL_PROGRAM} doom.x86 doomded.x86 ${DATADIR}
+.if !defined(WITH_NO_CDKEY)
+	${MKDIR} ${DATADIR}/d3xp
+	cd ${WRKSRC}/d3xp && \
+		${INSTALL_DATA} game01.pk4 pak*.pk4 ${DATADIR}/d3xp
+	${CP} -r ${WRKSRC}/pb ${DATADIR}
+.endif
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/doom3.png ${PREFIX}/share/pixmaps
 .for f in doom3 doom3-ded
diff --git a/games/linux-doom3/distinfo b/games/linux-doom3/distinfo
index 36d00882d09d..21574eb4a452 100644
--- a/games/linux-doom3/distinfo
+++ b/games/linux-doom3/distinfo
@@ -1,6 +1,6 @@
 MD5 (doom3-linux-1.1.1286.x86.run) = 2a45d0769b39473887c61a11cbba981c
 SHA256 (doom3-linux-1.1.1286.x86.run) = d02ee014017260f25e9ca07ccd3241f3766651fc94e3ca4924715f22c9029dbf
 SIZE (doom3-linux-1.1.1286.x86.run) = 7941364
-MD5 (doom3-linux-1.3.1302.x86.run) = b1d04da2d64bb8d54f64cbaa2fdb4490
-SHA256 (doom3-linux-1.3.1302.x86.run) = da90ba338eadb298a736af8786c0d7b11be698a399ac7a20549de0926a434677
-SIZE (doom3-linux-1.3.1302.x86.run) = 17199582
+MD5 (doom3-linux-1.3.1.1304.x86.run) = 6325f0936f59420d33668754032141cb
+SHA256 (doom3-linux-1.3.1.1304.x86.run) = 2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4
+SIZE (doom3-linux-1.3.1.1304.x86.run) = 21145838
diff --git a/games/linux-doom3/files/pkg-message.in b/games/linux-doom3/files/pkg-message.in
index 9d5fc6f81959..55f40250e2b8 100644
--- a/games/linux-doom3/files/pkg-message.in
+++ b/games/linux-doom3/files/pkg-message.in
@@ -4,4 +4,8 @@ To complete the installation of this port you need to copy the files
 "base/pak00[0-4].pk4", from the original Doom III distribution to
 "%%DATADIR%%/base".
 
+If you have the Doom III: Resurrection of Evil expansion copy the file
+"d3xp/pak000.pk4", from the original distribution to
+"%%DATADIR%%/d3xp".
+
 ==============================================================================
diff --git a/games/linux-doom3/pkg-plist b/games/linux-doom3/pkg-plist
index ad74b3e4a437..9a2361b1a1c6 100644
--- a/games/linux-doom3/pkg-plist
+++ b/games/linux-doom3/pkg-plist
@@ -4,8 +4,25 @@ bin/linux-doom3-ded
 %%DATADIR%%/base/pak005.pk4
 %%NEW%%%%DATADIR%%/base/pak006.pk4
 %%NEW%%%%DATADIR%%/base/pak007.pk4
+%%NEW%%%%DATADIR%%/base/pak008.pk4
+%%NEW%%%%DATADIR%%/d3xp/game01.pk4
+%%NEW%%%%DATADIR%%/d3xp/pak001.pk4
+%%NEW%%%%DATADIR%%/pb/htm/la001308.htm
+%%NEW%%%%DATADIR%%/pb/htm/lc001090.htm
+%%NEW%%%%DATADIR%%/pb/htm/ma001308.htm
+%%NEW%%%%DATADIR%%/pb/htm/mc001090.htm
+%%NEW%%%%DATADIR%%/pb/htm/wa001308.htm
+%%NEW%%%%DATADIR%%/pb/htm/wc001090.htm
+%%NEW%%%%DATADIR%%/pb/pbag.so
+%%NEW%%%%DATADIR%%/pb/pbags.so
+%%NEW%%%%DATADIR%%/pb/pbcl.so
+%%NEW%%%%DATADIR%%/pb/pbcls.so
+%%NEW%%%%DATADIR%%/pb/pbsv.so
 %%DATADIR%%/doom.x86
 %%DATADIR%%/doomded.x86
 share/pixmaps/doom3.png
+%%NEW%%@dirrm %%DATADIR%%/pb/htm
+%%NEW%%@dirrm %%DATADIR%%/pb
+%%NEW%%@dirrmtry %%DATADIR%%/d3xp
 @dirrmtry %%DATADIR%%/base
 @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