Index: head/games/eduke32/Makefile
===================================================================
--- head/games/eduke32/Makefile	(revision 419700)
+++ head/games/eduke32/Makefile	(revision 419701)
@@ -1,128 +1,112 @@
 # Created by: alepulver
 # $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}
 
 MAINTAINER=	pkubaj@anongoth.pl
 COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
 
 LICENSE=	GPLv2
 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=	*
 
 BROKEN_sparc64=	does not compile on sparc64
 
 OPTIONS_DEFINE=	DOCS EXAMPLES HRP OFFENSIVE SHAREWARE
 OPTIONS_RADIO=	MIDI
 OPTIONS_RADIO_MIDI=	TIMIDITY TIMIDITYPLUS
 OPTIONS_DEFAULT=TIMIDITY
 OPTIONS_DEFINE_i386=	ASM
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CC=/s|gcc|${CC}|' -e '/^CXX=/s|g++|${CXX}|' \
 		${WRKSRC}/Makefile.common
 	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \
 		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
 
 post-patch-ASM-off:
 	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.map ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.m32 ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}
 
 do-install-HRP-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/duke3d_hrp.zip ${STAGEDIR}${DATADIR}/duke3d_hrp.zip
 
 do-install-OFFENSIVE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/duke3d_xxx.zip ${STAGEDIR}${DATADIR}/duke3d_xxx.zip
 
 do-install-SHAREWARE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
 
 .include <bsd.port.mk>
Index: head/games/eduke32/distinfo
===================================================================
--- head/games/eduke32/distinfo	(revision 419700)
+++ head/games/eduke32/distinfo	(revision 419701)
@@ -1,8 +1,9 @@
-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
 SIZE (duke3d_xxx.zip) = 26586453
 SHA256 (3dduke13.zip) = c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
 SIZE (3dduke13.zip) = 5924374