games/eduke32: update to 20220204

While here, replace HRP and VOXEL options with HRP.
Also make install commands consistent with each other.

2 files changed, 24 insertions, 42 deletions

diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index e67d5fe3cb40..b86f3b49168b 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -1,19 +1,16 @@
 # Created by: alepulver
 
 PORTNAME=	eduke32
-PORTVERSION=	20210703
-PORTREVISION=	1
+PORTVERSION=	20220204
 CATEGORIES=	games
 MASTER_SITES=	http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \
-		http://www.duke4.org/files/nightfright/hrp/:hrp \
-		http://burnbit.com/download/447717/:hrp \
+		LOCAL/pkubaj/:erp \
 		http://www.duke4.org/files/nightfright/related/:related \
 		http://dukeworld.com/classic%20dukeworld/share/:shareware \
 		https://image.dosgamesarchive.com/games/:shareware \
 		https://www.quaddicted.com/files/idgames2/planetquake/planetduke/:shareware \
 		https://ftp.swin.edu.au/gentoo/distfiles/:shareware \
-		ftp://ftp.3drealms.com/share/:shareware \
-		https://github.com/NightFright2k19/voxelpack/releases/download/2.0-rc1/:voxel
+		ftp://ftp.3drealms.com/share/:shareware
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${GITREVISION}${EXTRACT_SUFX}:eduke32
 EXTRACT_ONLY=	${PORTNAME}_src_${PORTVERSION}-${GITREVISION}${EXTRACT_SUFX}
 
@@ -38,7 +35,7 @@ USE_GL=		gl glu
 USE_GNOME=	gtk20
 USE_SDL=	sdl2 mixer2
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${GITREVISION}
-GITREVISION=	9461-891bbb927
+GITREVISION=	9957-6df591a07
 DATADIR=	${PREFIX}/share/duke3d
 SUB_FILES=	pkg-message
 MAKEFILE=	GNUmakefile
@@ -47,7 +44,7 @@ MAKE_ARGS=	CC=${CC} CXX=${CXX}
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		EXAMPLES HRP OFFENSIVE VOXEL
+OPTIONS_DEFINE=		ERP EXAMPLES OFFENSIVE
 OPTIONS_RADIO=		GAMEDATA
 OPTIONS_RADIO_GAMEDATA=	SHAREWARE FULL
 OPTIONS_DEFINE_amd64=	ASM
@@ -57,20 +54,17 @@ OPTIONS_DEFAULT_i386=	ASM
 
 ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_MAKE_ARGS_OFF=	NOASM=1
-HRP_DESC=		Install High Resolution Pack
-HRP_DISTFILES=		duke3d_hrp.zip:hrp
-HRP_PLIST_FILES=	${DATADIR}/duke3d_hrp.zip
+ERP_DESC=		Install Enhanced Resource Pack
+ERP_DISTFILES=		duke-erp-210701.zip:erp
+ERP_PLIST_FILES=	${DATADIR}/duke-erp-210701.zip
 OFFENSIVE_DESC=		Install Full XXX Pack
-OFFENSIVE_IMPLIES=	HRP
+OFFENSIVE_IMPLIES=	ERP
 OFFENSIVE_DISTFILES=	duke3d_xxx.zip:related
 OFFENSIVE_PLIST_FILES=	${DATADIR}/duke3d_xxx.zip
 SHAREWARE_DESC=		Install shareware game data version 1.3
 SHAREWARE_EXTRACT_ONLY=	3dduke13.zip
 SHAREWARE_DISTFILES=	3dduke13.zip:shareware
 SHAREWARE_PLIST_FILES=	${DATADIR}/duke3d.grp ${DATADIR}/duke.rts
-VOXEL_DESC=		Install Voxel Pack
-VOXEL_DISTFILES=	duke3d_voxels.zip:voxel
-VOXEL_PLIST_FILES=	${DATADIR}/duke3d_voxels.zip
 FULL_DESC=		Install duke3d.grp and duke.rts from $${DISTDIR}/duke3d
 FULL_DISTFILES=		duke3d/duke3d.grp duke3d/duke.rts
 FULL_PLIST_FILES=	${DATADIR}/duke3d.grp ${DATADIR}/duke.rts
@@ -95,12 +89,6 @@ IGNORE=	option FULL selected, but duke3d.grp or duke.rts not found in ${DISTDIR}
 
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == clang
-MAKE_ARGS+=	CLANG=1
-.endif
-
 post-extract-SHAREWARE-on:
 	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
 
@@ -109,34 +97,30 @@ post-patch:
 		${WRKSRC}/source/duke3d/src/common.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin/
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}/
 
-do-install-HRP-on:
+do-install-ERP-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/duke3d_hrp.zip ${STAGEDIR}${DATADIR}/duke3d_hrp.zip
+	${INSTALL_DATA} ${DISTDIR}/duke-erp-210701.zip ${STAGEDIR}${DATADIR}/
 
 do-install-OFFENSIVE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/duke3d_xxx.zip ${STAGEDIR}${DATADIR}/duke3d_xxx.zip
+	${INSTALL_DATA} ${DISTDIR}/duke3d_xxx.zip ${STAGEDIR}${DATADIR}/
 
 do-install-SHAREWARE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
 	${INSTALL_DATA} ${WRKDIR}/DUKE.RTS ${STAGEDIR}${DATADIR}/duke.rts
 
-do-install-VOXEL-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/duke3d_voxels.zip ${STAGEDIR}${DATADIR}/duke3d_voxels.zip
-
 do-install-FULL-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/duke3d/duke3d.grp ${STAGEDIR}${DATADIR}/duke3d.grp
-	${INSTALL_DATA} ${DISTDIR}/duke3d/duke.rts ${STAGEDIR}${DATADIR}/duke.rts
+	${INSTALL_DATA} ${DISTDIR}/duke3d/duke3d.grp ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${DISTDIR}/duke3d/duke.rts ${STAGEDIR}${DATADIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo
index ab80e6b9e3cc..d2497d66c48a 100644
--- a/games/eduke32/distinfo
+++ b/games/eduke32/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1625583547
-SHA256 (eduke32_src_20210703-9461-891bbb927.tar.xz) = 6497b9f1f8784400d6949d1827cc05b26aa8873d9f71974e908c9357409963f0
-SIZE (eduke32_src_20210703-9461-891bbb927.tar.xz) = 20690672
-SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
-SIZE (duke3d_hrp.zip) = 933440151
+TIMESTAMP = 1645057951
+SHA256 (eduke32_src_20220204-9957-6df591a07.tar.xz) = cb0a229fa17279bfde96f36c1fd51811b1afbe6dd8cc0b58f694922e2e922534
+SIZE (eduke32_src_20220204-9957-6df591a07.tar.xz) = 20207948
+SHA256 (duke-erp-210701.zip) = cb6b18ea8a3983b9b152574c049eae45f743411d8896dd7331542c266b6aff3e
+SIZE (duke-erp-210701.zip) = 193941871
 SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534
 SIZE (duke3d_xxx.zip) = 26586453
 SHA256 (3dduke13.zip) = c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
 SIZE (3dduke13.zip) = 5924374
-SHA256 (duke3d_voxels.zip) = e59d901e26131cac32e7e99dfff4b29d8de9b0ae082099e7048c9d9ff333f6a4
-SIZE (duke3d_voxels.zip) = 3327368