Attachment #162276 for bug #202998

Lines 7895-7897 Link Here

(-)MOVED (+1 lines)
7895	net-mgmt/bsnmptools\|\|2015-10-16\|Has expired: client tools (including SNMPv3 support) are part of the base system	7895	net-mgmt/bsnmptools\|\|2015-10-16\|Has expired: client tools (including SNMPv3 support) are part of the base system
7896	security/yubikey-personalization\|security/ykpers\|2015-10-18\|Port duplicate with security/ykpers	7896	security/yubikey-personalization\|security/ykpers\|2015-10-18\|Port duplicate with security/ykpers
7897	devel/rubygem-listen2\|\|2015-10-20\|Has expired: not used by other ports anymore	7897	devel/rubygem-listen2\|\|2015-10-20\|Has expired: not used by other ports anymore
		7898	games/duke3d-data\|\|2015-10-21\|Incorporated into games/eduke32

Lines 211-217 Link Here

(-)games/Makefile (-1 lines)
211	SUBDIR += dsnake	211	SUBDIR += dsnake
212	SUBDIR += duckmaze	212	SUBDIR += duckmaze
213	SUBDIR += duel	213	SUBDIR += duel
214	SUBDIR += duke3d-data
215	SUBDIR += dunelegacy	214	SUBDIR += dunelegacy
216	SUBDIR += dungeon	215	SUBDIR += dungeon
217	SUBDIR += dungeoncrawl	216	SUBDIR += dungeoncrawl




# 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>




# 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

Lines 1-2 Link Here

(-)games/duke3d-data/distinfo (-2 lines)
1	SHA256 (3dduke13.zip) = c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
2	SIZE (3dduke13.zip) = 5924374

Lines 1-9 Link Here

(-)games/duke3d-data/files/pkg-message.in (-9 lines)
1	==============================================================================
2
3	To complete the installation of this port you need to copy the file
4	"DUKE3D.GRP" from the original Duke Nukem 3D distribution as "duke3d.grp" to
5	"%%DATADIR%%".
6
7	There is a high resolution pack at "http://hrp.duke4.net/".
8
9	==============================================================================

Lines 1-6 Link Here

(-)games/duke3d-data/pkg-descr (-6 lines)
1	This port installs the data files needed to run Duke Nukem 3D. It either asks
2	for the original data, or downloads a shareware version based on the selected
3	options. In the first case you need to have a legitimate copy of the game in
4	order to obtain the DUKE3D.GRP file.
5
6	WWW: http://www.3drealms.com/duke3d/

Lines 1-2 Link Here

(-)games/duke3d-data/pkg-plist (-2 lines)
1	%%DATADIR%%/.keepme
2	%%SHAREWARE%%%%DATADIR%%/duke3d.grp

Lines 2-12 Link Here

(-)games/eduke32/Makefile (-7 / +57 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eduke32	4	PORTNAME= eduke32
5	PORTVERSION= 20150830	5	PORTVERSION= 20151020
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \	7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32
8	http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/	8	DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32
9	DISTNAME= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}	9	EXTRACT_ONLY= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}
10		10
11	MAINTAINER= pkubaj@riseup.net	11	MAINTAINER= pkubaj@riseup.net
12	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke	12	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke
Lines 25-31 Link Here
25	USE_GNOME= gtk20	25	USE_GNOME= gtk20
26	USE_SDL= sdl2 mixer2	26	USE_SDL= sdl2 mixer2
27	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}	27	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
28	SVNREVISION= 5338	28	SVNREVISION= 5395
		29	DATADIR= ${LOCALBASE}/share/duke3d
		30	SUB_FILES= pkg-message
		31	SUB_LIST= DATADIR=${DATADIR}
29		32
30	PLIST_FILES= bin/eduke32 bin/mapster32	33	PLIST_FILES= bin/eduke32 bin/mapster32
31	PORTDOCS= *	34	PORTDOCS= *
Lines 33-39 Link Here
33		36
34	BROKEN_sparc64= does not compile on sparc64	37	BROKEN_sparc64= does not compile on sparc64
35		38
36	OPTIONS_DEFINE= DOCS EXAMPLES	39	OPTIONS_DEFINE= DOCS EXAMPLES HRP OFFENSIVE SHAREWARE
37	OPTIONS_RADIO= MIDI	40	OPTIONS_RADIO= MIDI
38	OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS	41	OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS
39	OPTIONS_DEFAULT=TIMIDITY	42	OPTIONS_DEFAULT=TIMIDITY
Lines 41-54 Link Here
41	OPTIONS_DEFAULT_i386= ASM	44	OPTIONS_DEFAULT_i386= ASM
42		45
43	ASM_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	46	ASM_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
		47	HRP_DESC= Install High Resolution Pack
44	MIDI_DESC= MIDI music support	48	MIDI_DESC= MIDI music support
		49	OFFENSIVE_DESC= Install full XXX Pack
		50	OFFENSIVE_IMPLIES= HRP
		51	SHAREWARE_DESC= Install shareware game data version 1.3
45	TIMIDITY_DESC= Use Timidity for music support	52	TIMIDITY_DESC= Use Timidity for music support
46	TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity	53	TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
47	TIMIDITYPLUS_DESC= Use Timidity++ for music support	54	TIMIDITYPLUS_DESC= Use Timidity++ for music support
48	TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++	55	TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++
49		56
50	.include "${.CURDIR}/../duke3d-data/Makefile.include"	57	.include <bsd.port.options.mk>
51		58
		59	.if ${PORT_OPTIONS:MHRP}
		60	DISTFILES+= duke3d_hrp.zip:hrp
		61	PLIST_SUB+= HRP=""
		62	PLIST_FILES+= ${DATADIR}/duke3d_hrp.zip
		63	MASTER_SITES+= http://www.duke4.org/files/nightfright/hrp/:hrp
		64	.else
		65	PLIST_SUB+= HRP="@comment "
		66	.endif
		67
		68	.if ${PORT_OPTIONS:MOFFENSIVE}
		69	DISTFILES+= duke3d_xxx.zip:xxx
		70	PLIST_SUB+= OFFENSIVE=""
		71	PLIST_FILES+= ${DATADIR}/duke3d_xxx.zip
		72	MASTER_SITES+= http://www.duke4.org/files/nightfright/:xxx
		73	.else
		74	PLIST_SUB+= XXX="@comment "
		75	.endif
		76
		77	.if ${PORT_OPTIONS:MSHAREWARE}
		78	EXTRACT_ONLY+= 3dduke13.zip
		79	DISTFILES+= 3dduke13.zip:shareware
		80	PLIST_SUB+= SHAREWARE=""
		81	PLIST_FILES+= ${DATADIR}/duke3d.grp
		82	MASTER_SITES+= ftp://ftp.3drealms.com/share/:shareware
		83	.else
		84	PLIST_SUB+= SHAREWARE="@comment "
		85	.endif
		86
		87	post-extract-SHAREWARE-on:
		88	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
		89
52	post-patch:	90	post-patch:
53	@${REINPLACE_CMD} -e '/^CC=/s\|gcc\|${CC}\|' -e '/^CXX=/s\|g++\|${CXX}\|' \	91	@${REINPLACE_CMD} -e '/^CC=/s\|gcc\|${CC}\|' -e '/^CXX=/s\|g++\|${CXX}\|' \
54	${WRKSRC}/Makefile.common	92	${WRKSRC}/Makefile.common
Lines 73-76 Link Here
73	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}	111	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
74	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}	112	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}
75		113
		114	do-install-HRP-on:
		115	@${MKDIR} ${STAGEDIR}${DATADIR}
		116	${INSTALL_DATA} ${DISTDIR}/duke3d_hrp.zip ${STAGEDIR}${DATADIR}/duke3d_hrp.zip
		117
		118	do-install-OFFENSIVE-on:
		119	@${MKDIR} ${STAGEDIR}${DATADIR}
		120	${INSTALL_DATA} ${DISTDIR}/duke3d_xxx.zip ${STAGEDIR}${DATADIR}/duke3d_xxx.zip
		121
		122	do-install-SHAREWARE-on:
		123	@${MKDIR} ${STAGEDIR}${DATADIR}
		124	${INSTALL_DATA} ${WRKDIR}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
		125
76	.include <bsd.port.mk>	126	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)games/eduke32/distinfo (-2 / +6 lines)
1	SHA256 (eduke32_src_20150830-5338.tar.xz) = 122375d58eb800e6b1eb4856757fccc3c6f463e5b724a866afc7ab6d84b1a0c2	1	SHA256 (eduke32_src_20151020-5395.tar.xz) = 9e5e55e7e2435e5922c4bed904e1dd4dc38c43d56a6bb7e78aa503df30e7f4fb
2	SIZE (eduke32_src_20150830-5338.tar.xz) = 14328856	2	SIZE (eduke32_src_20151020-5395.tar.xz) = 14340728
		3	SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
		4	SIZE (duke3d_hrp.zip) = 933440151
		5	SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534
		6	SIZE (duke3d_xxx.zip) = 26586453

Lines 12-20 Link Here

(-)games/eduke32/files/patch-Makefile.common (-2 / +1 lines)
12	OPTIMIZATIONS += $(DEBUGFLAG)	12	OPTIMIZATIONS += $(DEBUGFLAG)
13	endif	13	endif
14		14
15	-CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration	15	CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
16	-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings	16	-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings
17	+CONLYFLAGS=-std=gnu99 -Wimplicit
18	+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings	17	+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings
19	ASFORMAT=elf$(SYSBITS)	18	ASFORMAT=elf$(SYSBITS)
20	ASFLAGS=-s -f $(ASFORMAT) #-g	19	ASFLAGS=-s -f $(ASFORMAT) #-g




--- 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(255, 0, 255);
             char yellow = getclosestcol(255, 255, 0);
-            char *bakframe = (char *)Xaligned_alloc(16, xdim*ydim);
+	     char *bakframe;
+            posix_memalign(&bakframe, 16, xdim*ydim);
 
             begindrawing();  //{{{

 
             if (xdimen < 1 << 11)
             {
@@ -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);

Line 0 Link Here

(-)games/eduke32/files/pkg-message.in (+11 lines)
	1	==============================================================================
	2
	3	To complete the installation of this port you need to copy the file
	4	"DUKE3D.GRP" from the original Duke Nukem 3D distribution as "duke3d.grp" to
	5	%%DATADIR%%, if you want to install it globally, and then run with
	6	-g %%DATADIR%%/duke3d.grp parameter. If you also installed any of the
	7	optional packs, you need to add the -g parameter in the same manner.
	8
	9	If you installed the XXX Pack, you need to include both HRP and XXX Packs.
	10
	11	==============================================================================

Return to bug 202998

Lines 1-56 Link Here

(-)games/duke3d-data/Makefile (-56 lines)
1	# Created by: alepulver
2	# $FreeBSD$
3
4	PORTNAME= data
5	PORTVERSION= 1.0
6	PORTREVISION= 2
7	CATEGORIES= games
8	MASTER_SITES= ftp://ftp.3drealms.com/share/ \
9	ftp://ftp.kiarchive.ru/pub/.1/msdos/games/play/3d/ \
10	ftp://ftp.relcom.ru/pub/.1/msdos/games/play/3d/ \
11	ftp://ftp.relcom.ru/pub/.1/msdos/games/play/3d/ \
12	ftp://ftp.lublin.pl/vol/8/planetquake/planetduke/ \
13	ftp://ftp.etsimo.uniovi.es/pub/games/msdos/ \
14	ftp://ftp.uniovi.es/pub/games/msdos/ \
15	ftp://ftp.ziplink.net/users/rhino/ \
16	ftp://ftp.kiae.su/pub/.1/msdos/games/play/3d/
17	PKGNAMEPREFIX= ${DN3DPKGNAMEPREFIX}
18	DISTFILES= #
19
20	MAINTAINER= ports@FreeBSD.org
21	COMMENT= Duke Nukem 3D Data
22
23	USES= zip
24	NO_BUILD= yes
25	NO_WRKSUBDIR= yes
26
27	OPTIONS_DEFINE= SHAREWARE
28	SHAREWARE_DESC= Install shareware game data version 1.3
29
30	DATADIR= ${DN3DDIR:C/^${LOCALBASE}/${PREFIX}/}
31
32	.include "Makefile.include"
33
34	.include <bsd.port.options.mk>
35
36	.if ${PORT_OPTIONS:MSHAREWARE}
37	DISTFILES+= 3dduke13.zip
38	PLIST_SUB+= SHAREWARE=""
39	.else
40	PLIST_SUB+= SHAREWARE="@comment "
41	SUB_FILES+= pkg-message
42	.endif
43
44	.if ${PORT_OPTIONS:MSHAREWARE}
45	post-extract:
46	@cd ${WRKSRC} && ${UNZIP_CMD} -qo DN3DSW13.SHR
47	.endif
48
49	do-install:
50	@${MKDIR} ${STAGEDIR}${DATADIR}
51	@${TOUCH} ${STAGEDIR}${DATADIR}/.keepme
52	.if ${PORT_OPTIONS:MSHAREWARE}
53	${INSTALL_DATA} ${WRKSRC}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
54	.endif
55
56	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)games/duke3d-data/Makefile.include (-29 lines)
1	# Makefile for defining variables used by Duke Nukem 3D related ports.
2	#
3	# A dependency to "games/duke3d-data" is automatically added (except for the
4	# data port itself). The ports using this definitions should assume the data
5	# is installed (i.e. no need for pkg-message asking to copy duke3d.grp).
6	#
7	# The following variables are defined, and can be used in the port.
8	# DN3DPKGNAMEPREFIX - The package name prefix for Duke Nukem 3D additions
9	# DN3DDIR - The Duke Nukem 3D data directory (also added to
10	# MAKE_ENV, PLIST_SUB, and SUB_LIST)
11	#
12	# For notes about this kind of ports see /usr/ports/games/quake2-data (some
13	# rules apply to this ports, like search paths).
14	#
15
16	DN3DPKGNAMEPREFIX?= duke3d-
17	DN3DDIR?= ${LOCALBASE}/share/duke3d
18
19	.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
20	. error include before <bsd.port.options.mk> if using DN3DPKGNAMEPREFIX
21	.endif
22
23	MAKE_ENV+= DN3DDIR="${DN3DDIR}"
24	PLIST_SUB+= DN3DDIR="${DN3DDIR:S/${LOCALBASE}\///}"
25	SUB_LIST+= DN3DDIR="${DN3DDIR}"
26
27	.if ${PORTNAME} != "data"
28	RUN_DEPENDS+= ${DN3DDIR}/.keepme:${PORTSDIR}/games/duke3d-data
29	.endif

Lines 1-11 Link Here

(-)games/eduke32/files/patch-build_src_engine.c (-7 / +7 lines)
1	--- build/src/engine.c.orig 2015-08-02 08:40:39 UTC	1	--- build/src/engine.c.orig 2015-09-23 17:55:31 UTC
2	+++ build/src/engine.c	2	+++ build/src/engine.c
3	@@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch)	3	@@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch)
4	static char fn[32], tmpbuf[80];	4	static char fn[32], tmpbuf[80];
5	char purple = getclosestcol(63, 0, 63);	5	char purple = getclosestcol(255, 0, 255);
6	char yellow = getclosestcol(63, 63, 0);	6	char yellow = getclosestcol(255, 255, 0);
7	- char bakframe = (char )Xaligned_alloc(16, xdim*ydim);	7	- char bakframe = (char )Xaligned_alloc(16, xdim*ydim);
8	+ char *bakframe;	8	+ char *bakframe;
9	+ posix_memalign(&bakframe, 16, xdim*ydim);	9	+ posix_memalign(&bakframe, 16, xdim*ydim);
10		10
11	begindrawing(); //{{{	11	begindrawing(); //{{{
Lines 19-27 Link Here
19		19
20	if (xdimen < 1 << 11)	20	if (xdimen < 1 << 11)
21	{	21	{
22	@@ -11654,7 +11655,7 @@ static void initsmost(void)	22	@@ -11757,7 +11758,7 @@ static void initsmost(void)
23	if (*dynarray[i].ptr)	23	{
24	Baligned_free(*dynarray[i].ptr);	24	Baligned_free(*dynarray[i].ptr);
25		25
26	- *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size);	26	- *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size);
27	+ posix_memalign(dynarray[i].ptr, 16, dynarray[i].size);	27	+ posix_memalign(dynarray[i].ptr, 16, dynarray[i].size);