Update to upstream revision r5506, collapse games/duke3d-data info eduke

Detailed log from submitter:
- updates games/eduke32 to 5506,
- removes games/duke3d-data
- adds option to install HRP,
- adds option to install XXX Pack.

PR:		202998
Submitted by:	pkubaj@anongoth.pl (maintainer)

12 files changed, 78 insertions, 116 deletions

diff --git a/MOVED b/MOVED
index 27fb948878b9..75dd86ae4de0 100644
--- a/MOVED
+++ b/MOVED
@@ -8094,3 +8094,4 @@ misc/kde4-l10n-th||2016-01-01|Has expired: Upstream ceased maintainance of this
 misc/kde4-l10n-tg||2016-01-01|Has expired: Upstream ceased maintainance of this translation
 misc/kde4-l10n-si||2016-01-01|Has expired: Upstream ceased maintainance of this translation
 games/supertux-devel|games/supertux2|2016-01-05|Renamed along with update to new stable release
+games/duke3d-data||2016-01-06|Incorporated into games/eduke32
diff --git a/games/Makefile b/games/Makefile
index 5957c222d5ea..1ddbebbf852b 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -212,7 +212,6 @@
     SUBDIR += dsnake
     SUBDIR += duckmaze
     SUBDIR += duel
-    SUBDIR += duke3d-data
     SUBDIR += dunelegacy
     SUBDIR += dungeon
     SUBDIR += dungeoncrawl
diff --git a/games/duke3d-data/Makefile b/games/duke3d-data/Makefile
deleted file mode 100644
index 242bfa877dab..000000000000
--- a/games/duke3d-data/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: alepulver
-# $FreeBSD$
-
-PORTNAME=	data
-PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.3drealms.com/share/ \
-		ftp://ftp.kiarchive.ru/pub/.1/msdos/games/play/3d/ \
-		ftp://ftp.relcom.ru/pub/.1/msdos/games/play/3d/ \
-		ftp://ftp.relcom.ru/pub/.1/msdos/games/play/3d/ \
-		ftp://ftp.lublin.pl/vol/8/planetquake/planetduke/ \
-		ftp://ftp.etsimo.uniovi.es/pub/games/msdos/ \
-		ftp://ftp.uniovi.es/pub/games/msdos/ \
-		ftp://ftp.ziplink.net/users/rhino/ \
-		ftp://ftp.kiae.su/pub/.1/msdos/games/play/3d/
-PKGNAMEPREFIX=	${DN3DPKGNAMEPREFIX}
-DISTFILES=	#
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Duke Nukem 3D Data
-
-USES=		zip
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-OPTIONS_DEFINE=	SHAREWARE
-SHAREWARE_DESC=	Install shareware game data version 1.3
-
-DATADIR=	${DN3DDIR:C/^${LOCALBASE}/${PREFIX}/}
-
-.include "Makefile.include"
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSHAREWARE}
-DISTFILES+=	3dduke13.zip
-PLIST_SUB+=	SHAREWARE=""
-.else
-PLIST_SUB+=	SHAREWARE="@comment "
-SUB_FILES+=	pkg-message
-.endif
-
-.if ${PORT_OPTIONS:MSHAREWARE}
-post-extract:
-	@cd ${WRKSRC} && ${UNZIP_CMD} -qo DN3DSW13.SHR
-.endif
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${TOUCH} ${STAGEDIR}${DATADIR}/.keepme
-.if ${PORT_OPTIONS:MSHAREWARE}
-	${INSTALL_DATA} ${WRKSRC}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
-.endif
-
-.include <bsd.port.mk>
diff --git a/games/duke3d-data/Makefile.include b/games/duke3d-data/Makefile.include
deleted file mode 100644
index a3fe9134564b..000000000000
--- a/games/duke3d-data/Makefile.include
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile for defining variables used by Duke Nukem 3D related ports.
-#
-# A dependency to "games/duke3d-data" is automatically added (except for the
-# data port itself). The ports using this definitions should assume the data
-# is installed (i.e. no need for pkg-message asking to copy duke3d.grp).
-#
-# The following variables are defined, and can be used in the port.
-# DN3DPKGNAMEPREFIX	- The package name prefix for Duke Nukem 3D additions
-# DN3DDIR		- The Duke Nukem 3D data directory (also added to
-#			  MAKE_ENV, PLIST_SUB, and SUB_LIST)
-#
-# For notes about this kind of ports see /usr/ports/games/quake2-data (some
-# rules apply to this ports, like search paths).
-#
-
-DN3DPKGNAMEPREFIX?=	duke3d-
-DN3DDIR?=	${LOCALBASE}/share/duke3d
-
-.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
-.  error include before <bsd.port.options.mk> if using DN3DPKGNAMEPREFIX
-.endif
-
-MAKE_ENV+=	DN3DDIR="${DN3DDIR}"
-PLIST_SUB+=	DN3DDIR="${DN3DDIR:S/${LOCALBASE}\///}"
-SUB_LIST+=	DN3DDIR="${DN3DDIR}"
-
-.if ${PORTNAME} != "data"
-RUN_DEPENDS+=	${DN3DDIR}/.keepme:${PORTSDIR}/games/duke3d-data
-.endif
diff --git a/games/duke3d-data/distinfo b/games/duke3d-data/distinfo
deleted file mode 100644
index 55b52b2d9c58..000000000000
--- a/games/duke3d-data/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (3dduke13.zip) = c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
-SIZE (3dduke13.zip) = 5924374
diff --git a/games/duke3d-data/pkg-descr b/games/duke3d-data/pkg-descr
deleted file mode 100644
index af553b65b85b..000000000000
--- a/games/duke3d-data/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port installs the data files needed to run Duke Nukem 3D. It either asks
-for the original data, or downloads a shareware version based on the selected
-options. In the first case you need to have a legitimate copy of the game in
-order to obtain the DUKE3D.GRP file.
-
-WWW: http://www.3drealms.com/duke3d/
diff --git a/games/duke3d-data/pkg-plist b/games/duke3d-data/pkg-plist
deleted file mode 100644
index cce0b46ae669..000000000000
--- a/games/duke3d-data/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%DATADIR%%/.keepme
-%%SHAREWARE%%%%DATADIR%%/duke3d.grp
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index cff977f6d941..2e7833643100 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	eduke32
-PORTVERSION=	20150830
+PORTVERSION=	20160103
 CATEGORIES=	games
-MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \
-		http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/
-DISTNAME=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}
+MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32
+DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32
+EXTRACT_ONLY=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}
 
 MAINTAINER=	pkubaj@riseup.net
 COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
@@ -25,7 +25,10 @@ USE_GL=		gl glu
 USE_GNOME=	gtk20
 USE_SDL=	sdl2 mixer2
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
-SVNREVISION=	5338
+SVNREVISION=	5506
+DATADIR=	${LOCALBASE}/share/duke3d
+SUB_FILES=	pkg-message
+SUB_LIST=	DATADIR=${DATADIR}
 
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTDOCS=	*
@@ -33,7 +36,7 @@ PORTEXAMPLES=	*
 
 BROKEN_sparc64=	does not compile on sparc64
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES HRP OFFENSIVE SHAREWARE
 OPTIONS_RADIO=	MIDI
 OPTIONS_RADIO_MIDI=	TIMIDITY TIMIDITYPLUS
 OPTIONS_DEFAULT=TIMIDITY
@@ -41,13 +44,48 @@ OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 
 ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+HRP_DESC=	Install High Resolution Pack
 MIDI_DESC=	MIDI music support
+OFFENSIVE_DESC=	Install full XXX Pack
+OFFENSIVE_IMPLIES=	HRP
+SHAREWARE_DESC=	Install shareware game data version 1.3
 TIMIDITY_DESC=	Use Timidity for music support
 TIMIDITY_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 TIMIDITYPLUS_DESC=	Use Timidity++ for music support
 TIMIDITYPLUS_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++
 
-.include "${.CURDIR}/../duke3d-data/Makefile.include"
+.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}|' \
@@ -73,4 +111,16 @@ do-install-EXAMPLES-on:
 	${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>
diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo
index 839d1ce42e03..9afb8d43944a 100644
--- a/games/eduke32/distinfo
+++ b/games/eduke32/distinfo
@@ -1,2 +1,8 @@
-SHA256 (eduke32_src_20150830-5338.tar.xz) = 122375d58eb800e6b1eb4856757fccc3c6f463e5b724a866afc7ab6d84b1a0c2
-SIZE (eduke32_src_20150830-5338.tar.xz) = 14328856
+SHA256 (eduke32_src_20160103-5506.tar.xz) = bdd4ea7100c3913981f1be0fc26285a433659bf83528cb2a93f0bcabd95aa34a
+SIZE (eduke32_src_20160103-5506.tar.xz) = 14352508
+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
diff --git a/games/eduke32/files/patch-Makefile.common b/games/eduke32/files/patch-Makefile.common
index f6cafcb20acb..d379ba1916e7 100644
--- a/games/eduke32/files/patch-Makefile.common
+++ b/games/eduke32/files/patch-Makefile.common
@@ -12,9 +12,8 @@
      OPTIMIZATIONS += $(DEBUGFLAG)
  endif
  
--CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
+ CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
 -CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings
-+CONLYFLAGS=-std=gnu99 -Wimplicit 
 +CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings
  ASFORMAT=elf$(SYSBITS)
  ASFLAGS=-s -f $(ASFORMAT) #-g
diff --git a/games/eduke32/files/patch-build_src_engine.c b/games/eduke32/files/patch-build_src_engine.c
index a7ccecc9d871..4ff51fd95252 100644
--- a/games/eduke32/files/patch-build_src_engine.c
+++ b/games/eduke32/files/patch-build_src_engine.c
@@ -1,11 +1,11 @@
---- build/src/engine.c.orig	2015-08-02 08:40:39 UTC
+--- build/src/engine.c.orig	2015-09-23 17:55:31 UTC
 +++ build/src/engine.c
 @@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch)
              static char fn[32], tmpbuf[80];
-             char purple = getclosestcol(63, 0, 63);
-             char yellow = getclosestcol(63, 63, 0);
+             char purple = getclosestcol(255, 0, 255);
+             char yellow = getclosestcol(255, 255, 0);
 -            char *bakframe = (char *)Xaligned_alloc(16, xdim*ydim);
-+            char *bakframe;
++	     char *bakframe;
 +            posix_memalign(&bakframe, 16, xdim*ydim);
  
              begindrawing();  //{{{
@@ -19,9 +19,9 @@
  
              if (xdimen < 1 << 11)
              {
-@@ -11654,7 +11655,7 @@ static void initsmost(void)
-         if (*dynarray[i].ptr)
-             Baligned_free(*dynarray[i].ptr);
+@@ -11757,7 +11758,7 @@ static void initsmost(void)
+     {
+         Baligned_free(*dynarray[i].ptr);
  
 -        *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size);
 +         posix_memalign(dynarray[i].ptr, 16, dynarray[i].size);
diff --git a/games/duke3d-data/files/pkg-message.in b/games/eduke32/files/pkg-message.in
index ff24a594db74..e021114ff1db 100644
--- a/games/duke3d-data/files/pkg-message.in
+++ b/games/eduke32/files/pkg-message.in
@@ -2,8 +2,10 @@
 
 To complete the installation of this port you need to copy the file
 "DUKE3D.GRP" from the original Duke Nukem 3D distribution as "duke3d.grp" to
-"%%DATADIR%%".
+%%DATADIR%%, if you want to install it globally, and then run with
+-g %%DATADIR%%/duke3d.grp parameter. If you also installed any of the
+optional packs, you need to add the -g parameter in the same manner.
 
-There is a high resolution pack at "http://hrp.duke4.net/".
+If you installed the XXX Pack, you need to include both HRP and XXX Packs.
 
 ==============================================================================