- Update to version r5811 [1]

- Since duke4.org currently has no DNS records and burnbit.com doesn't
  respond, fetching optional distfiles fails.
  Now hosted on maintainers server. [1]
- Convert rest of the options to helpers

PR:		210970 [1]
Submitted by:	Piotr Kubaj (maintainer) [1]

2 files changed, 24 insertions, 39 deletions

diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index fd36f4049449..4e9cbffb2d84 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -2,9 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	eduke32
-PORTVERSION=	20160610
+PORTVERSION=	20160704
 CATEGORIES=	games
-MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32
+MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 \
+		http://www.duke4.org/files/nightfright/hrp/:hrp \
+		http://burnbit.com/download/447717/:hrp \
+		https://anongoth.pl/:hrp \
+		https://anongoth.pl/:xxx \
+		http://www.duke4.org/files/nightfright/:xxx \
+		ftp://ftp.3drealms.com/share/:shareware
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32
 EXTRACT_ONLY=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}
 
@@ -17,19 +23,22 @@ LICENSE_FILE=	${WRKSRC}/source/gpl-2.0.txt
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
-		libvpx.so:multimedia/libvpx
+		libvpx.so:multimedia/libvpx \
+		libpng16.so:graphics/png
 
-USES=		execinfo gmake tar:xz
+USES=		execinfo gmake pkgconfig tar:xz
 USE_GCC=	any
 USE_GL=		gl glu
 USE_GNOME=	gtk20
 USE_SDL=	sdl2 mixer2
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
-SVNREVISION=	5775
+SVNREVISION=	5811
 DATADIR=	${LOCALBASE}/share/duke3d
 SUB_FILES=	pkg-message
 SUB_LIST=	DATADIR=${DATADIR}
 
+CFLAGS+=	-flax-vector-conversions
+
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTDOCS=	*
 PORTEXAMPLES=	*
@@ -45,47 +54,22 @@ OPTIONS_DEFAULT_i386=	ASM
 
 ASM_BUILD_DEPENDS=	nasm:devel/nasm
 HRP_DESC=	Install High Resolution Pack
+HRP_DISTFILES=	duke3d_hrp.zip:hrp
+HRP_PLIST_FILES=	${DATADIR}/duke3d_hrp.zip
 MIDI_DESC=	MIDI music support
 OFFENSIVE_DESC=	Install full XXX Pack
 OFFENSIVE_IMPLIES=	HRP
+OFFENSIVE_DISTFILES=	duke3d_xxx.zip:xxx
+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
 TIMIDITY_DESC=	Use Timidity for music support
 TIMIDITY_RUN_DEPENDS=	timidity:audio/timidity
 TIMIDITYPLUS_DESC=	Use Timidity++ for music support
 TIMIDITYPLUS_RUN_DEPENDS=	timidity:audio/timidity++
 
-CFLAGS+=	-flax-vector-conversions
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHRP}
-DISTFILES+=	duke3d_hrp.zip:hrp
-PLIST_SUB+=	HRP=""
-PLIST_FILES+=	${DATADIR}/duke3d_hrp.zip
-MASTER_SITES+=	http://www.duke4.org/files/nightfright/hrp/:hrp
-.else
-PLIST_SUB+=	HRP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOFFENSIVE}
-DISTFILES+=	duke3d_xxx.zip:xxx
-PLIST_SUB+=	OFFENSIVE=""
-PLIST_FILES+=	 ${DATADIR}/duke3d_xxx.zip
-MASTER_SITES+=	http://www.duke4.org/files/nightfright/:xxx
-.else
-PLIST_SUB+=	XXX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSHAREWARE}
-EXTRACT_ONLY+=	3dduke13.zip
-DISTFILES+=	3dduke13.zip:shareware
-PLIST_SUB+=	SHAREWARE=""
-PLIST_FILES+=	${DATADIR}/duke3d.grp
-MASTER_SITES+=	ftp://ftp.3drealms.com/share/:shareware
-.else
-PLIST_SUB+=	SHAREWARE="@comment "
-.endif
-
 post-extract-SHAREWARE-on:
 	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
 
diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo
index ac3c5c020a7c..9f02e394db30 100644
--- a/games/eduke32/distinfo
+++ b/games/eduke32/distinfo
@@ -1,5 +1,6 @@
-SHA256 (eduke32_src_20160610-5775.tar.xz) = ce75431ca0145f1c37934d5c934393982f27b6aa64619a4023ce54e4fd50c8f9
-SIZE (eduke32_src_20160610-5775.tar.xz) = 14532340
+TIMESTAMP = 1468168899
+SHA256 (eduke32_src_20160704-5811.tar.xz) = 28a351aff5c1fc8412dfb8aa9f17b1fcfded70e04c3b90a301d2e1e1ead78105
+SIZE (eduke32_src_20160704-5811.tar.xz) = 14125320
 SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
 SIZE (duke3d_hrp.zip) = 933440151
 SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534