Attachment #171476 for bug #209987




# $FreeBSD$

PORTNAME=	eduke32
PORTVERSION=	20160610
CATEGORIES=	games
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@anongoth.pl
COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke

LICENSE=	GPLv2

USE_GNOME=	gtk20
USE_SDL=	sdl2 mixer2
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
SVNREVISION=	5775
DATADIR=	${LOCALBASE}/share/duke3d
SUB_FILES=	pkg-message
SUB_LIST=	DATADIR=${DATADIR}

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}

Lines 1-5 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (eduke32_src_20160103-5506.tar.xz) = bdd4ea7100c3913981f1be0fc26285a433659bf83528cb2a93f0bcabd95aa34a	1	SHA256 (eduke32_src_20160610-5775.tar.xz) = ce75431ca0145f1c37934d5c934393982f27b6aa64619a4023ce54e4fd50c8f9
2	SIZE (eduke32_src_20160103-5506.tar.xz) = 14352508	2	SIZE (eduke32_src_20160610-5775.tar.xz) = 14532340
3	SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5	3	SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
4	SIZE (duke3d_hrp.zip) = 933440151	4	SIZE (duke3d_hrp.zip) = 933440151
5	SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534	5	SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534




--- Makefile.common.orig	2016-06-03 04:50:55 UTC
+++ Makefile.common
@@ -252,7 +252,6 @@ ifndef LTO
     endif
 endif
 

 COMPILERFLAGS=
 
 ifeq ($(PACKAGE_REPOSITORY),0)
@@ -273,7 +272,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)
     OPTIMIZATIONS += $(DEBUGFLAG)
 endif
 
 CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
-CXXONLYFLAGS= -fno-exceptions -fno-rtti
+CXXONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive
 ASFORMAT=elf$(BITS)
 ASFLAGS=-s -f $(ASFORMAT) #-g
 LINKERFLAGS=

Lines 1-11 Link Here

(-)files/patch-build_src_baselayer.c (-6 / +6 lines)
1	--- build/src/baselayer.c.orig 2015-07-25 17:23:17 UTC	1	--- build/src/baselayer.c.orig 2016-05-29 21:11:27 UTC
2	+++ build/src/baselayer.c	2	+++ build/src/baselayer.c
3	@@ -219,7 +219,7 @@ void calc_ylookup(int32_t bpl, int32_t l	3	@@ -227,7 +227,7 @@ void calc_ylookup(int32_t bpl, int32_t l
4	{	4	{
5	Baligned_free(ylookup);	5	Baligned_free(ylookup);
6		6
7	- ylookup = (intptr_t )Xaligned_alloc(16, lastyidx sizeof(intptr_t));	7	- ylookup = (intptr_t )Xaligned_alloc(16, lastyidx sizeof(intptr_t));
8	+ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t));	8	+ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t));
9	#if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__)	9	ylookupsiz = lastyidx;
10	nx_unprotect((intptr_t)ylookup, (intptr_t)ylookup + (lastyidx * sizeof(intptr_t)));	10	}
11	#endif	11

Return to bug 209987

Lines 2-14 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eduke32	4	PORTNAME= eduke32
5	PORTVERSION= 20160103	5	PORTVERSION= 20160610
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32	7	MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32
8	DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32	8	DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32
9	EXTRACT_ONLY= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}	9	EXTRACT_ONLY= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}
10		10
11	MAINTAINER= pkubaj@riseup.net	11	MAINTAINER= pkubaj@anongoth.pl
12	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke	12	COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
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= 5506	28	SVNREVISION= 5775
29	DATADIR= ${LOCALBASE}/share/duke3d	29	DATADIR= ${LOCALBASE}/share/duke3d
30	SUB_FILES= pkg-message	30	SUB_FILES= pkg-message
31	SUB_LIST= DATADIR=${DATADIR}	31	SUB_LIST= DATADIR=${DATADIR}
Lines 54-59 Link Here
54	TIMIDITYPLUS_DESC= Use Timidity++ for music support	54	TIMIDITYPLUS_DESC= Use Timidity++ for music support
55	TIMIDITYPLUS_RUN_DEPENDS= timidity:audio/timidity++	55	TIMIDITYPLUS_RUN_DEPENDS= timidity:audio/timidity++
56		56
		57	CFLAGS+= -flax-vector-conversions
		58
57	.include <bsd.port.options.mk>	59	.include <bsd.port.options.mk>
58		60
59	.if ${PORT_OPTIONS:MHRP}	61	.if ${PORT_OPTIONS:MHRP}

Lines 1-6 Link Here

(-)files/patch-Makefile.common (-7 / +6 lines)
1	--- Makefile.common.orig 2015-07-08 03:34:34 UTC	1	--- Makefile.common.orig 2016-06-03 04:50:55 UTC
2	+++ Makefile.common	2	+++ Makefile.common
3	@@ -258,7 +258,6 @@ ifndef LTO	3	@@ -252,7 +252,6 @@ ifndef LTO
4	endif	4	endif
5	endif	5	endif
6		6
Lines 8-20 Link Here
8	COMPILERFLAGS=	8	COMPILERFLAGS=
9		9
10	ifeq ($(PACKAGE_REPOSITORY),0)	10	ifeq ($(PACKAGE_REPOSITORY),0)
11	@@ -278,8 +277,8 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)	11	@@ -273,7 +272,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)
12	OPTIMIZATIONS += $(DEBUGFLAG)
13	endif	12	endif
14		13
15	CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration	14	CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration
16	-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings	15	-CXXONLYFLAGS= -fno-exceptions -fno-rtti
17	+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings	16	+CXXONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive
18	ASFORMAT=elf$(SYSBITS)	17	ASFORMAT=elf$(BITS)
19	ASFLAGS=-s -f $(ASFORMAT) #-g	18	ASFLAGS=-s -f $(ASFORMAT) #-g
20	LINKERFLAGS=	19	LINKERFLAGS=