Index: Makefile =================================================================== --- Makefile (revision 394909) +++ Makefile (working copy) @@ -2,27 +2,25 @@ # $FreeBSD$ PORTNAME= eduke32 -PORTVERSION= 20110627 -PORTREVISION= 5 +PORTVERSION= 20150818 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} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pkubaj@riseup.net COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/GNU.TXT +LICENSE_FILE= ${WRKSRC}/source/gpl-2.0.txt -USES= execinfo gmake tar:bzip2 +USES= execinfo gmake tar:xz USE_GCC= any -USE_CSTD= gnu89 USE_GL= gl USE_GNOME= gtk20 -USE_SDL= mixer sdl +USE_SDL= sdl2 mixer2 WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION} -SVNREVISION= 1923 +SVNREVISION= 5334 PLIST_FILES= bin/eduke32 bin/mapster32 PORTDOCS= * @@ -30,10 +28,9 @@ BROKEN_sparc64= Does not compile on sparc64 -OPTIONS_DEFINE= VORBIS OPTIONS_RADIO= MIDI OPTIONS_RADIO_MIDI= TIMIDITY TIMIDITYPLUS -OPTIONS_DEFAULT=TIMIDITY VORBIS +OPTIONS_DEFAULT=TIMIDITY MIDI_DESC= MIDI music support TIMIDITY_DESC= Use Timidity for music support @@ -40,8 +37,11 @@ TIMIDITY_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity TIMIDITYPLUS_DESC= Use Timidity++ for music support TIMIDITYPLUS_RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++ -VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac +LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis + .include "${.CURDIR}/../duke3d-data/Makefile.include" .include @@ -51,36 +51,23 @@ .endif post-patch: -.if ! ${PORT_OPTIONS:MVORBIS} - @${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile -.endif .if ${ARCH} != "i386" @${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common .endif @${REINPLACE_CMD} -e '/^CC=/s/gcc/${CC}/' -e '/^CXX=/s/g++/${CXX}/' \ ${WRKSRC}/Makefile.common - @${REINPLACE_CMD} 's/ \$$(ARCH)//' ${WRKSRC}/Makefile \ - ${WRKSRC}/build/Makefile - @${REINPLACE_CMD} -Ee '/^ifeq/s/LINUX/BSD/' \ - -e 's/(\+= -lvorbisfile)/\1 -lexecinfo/' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' -e 's/ -ldl//' \ - ${WRKSRC}/build/Makefile - @${REINPLACE_CMD} -E 's|(SDLCONFIG[[:space:]]*=).*|\1${SDL_CONFIG}|' \ - ${WRKSRC}/build/Makefile.shared @${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \ ${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c - @${REINPLACE_CMD} -E 's|(-DHAVE_VORBIS)|-I${LOCALBASE}/include \1|' \ - ${WRKSRC}/source/jaudiolib/Makefile do-install: -.for f in eduke32 mapster32 - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/samples/*.sample ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -. for f in cfg map m32 txt - ${INSTALL_DATA} ${WRKSRC}/samples/*.${f} ${STAGEDIR}${EXAMPLESDIR} -. endfor + ${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} .include Index: distinfo =================================================================== --- distinfo (revision 394909) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (eduke32_src_20110627-1923.tar.bz2) = 6ad33f7acf9cdd26ca49f7813fbe23b888b95fd2f587851c971f860b59185e4a -SIZE (eduke32_src_20110627-1923.tar.bz2) = 2817419 +SHA256 (eduke32_src_20150818-5334.tar.xz) = 4d22d5646960f954d2a82fa66941dedb64a6c78d3ced33f925ac161524406908 +SIZE (eduke32_src_20150818-5334.tar.xz) = 14330976 Index: files/patch-Makefile.common =================================================================== --- /dev/null (revision 0) +++ files/patch-Makefile.common (working copy) @@ -0,0 +1,21 @@ +--- Makefile.common.orig 2015-07-08 03:34:34 UTC ++++ Makefile.common +@@ -258,7 +258,6 @@ ifndef LTO + endif + endif + +-COMMONFLAGS=$(ARCH) + COMPILERFLAGS= + + ifeq ($(PACKAGE_REPOSITORY),0) +@@ -278,8 +277,8 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10) + OPTIMIZATIONS += $(DEBUGFLAG) + endif + +-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 + LINKERFLAGS= Property changes on: files/patch-Makefile.common ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-build_src_baselayer.c =================================================================== --- /dev/null (revision 0) +++ files/patch-build_src_baselayer.c (working copy) @@ -0,0 +1,11 @@ +--- build/src/baselayer.c.orig 2015-07-25 17:23:17 UTC ++++ build/src/baselayer.c +@@ -219,7 +219,7 @@ void calc_ylookup(int32_t bpl, int32_t l + { + Baligned_free(ylookup); + +- ylookup = (intptr_t *)Xaligned_alloc(16, lastyidx * sizeof(intptr_t)); ++ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t)); + #if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__) + nx_unprotect((intptr_t)ylookup, (intptr_t)ylookup + (lastyidx * sizeof(intptr_t))); + #endif Property changes on: files/patch-build_src_baselayer.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-build_src_engine.c =================================================================== --- /dev/null (revision 0) +++ files/patch-build_src_engine.c (working copy) @@ -0,0 +1,30 @@ +--- build/src/engine.c.orig 2015-08-02 08:40:39 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 *bakframe = (char *)Xaligned_alloc(16, xdim*ydim); ++ char *bakframe; ++ posix_memalign(&bakframe, 16, xdim*ydim); + + begindrawing(); //{{{ + Bmemcpy(bakframe, (char *)frameplace, xdim*ydim); +@@ -8142,7 +8143,7 @@ static void dosetaspect(void) + if (xdimen != oxdimen && voxoff[0][0]) + { + if (distrecip == NULL) +- distrecip = (uint32_t *)Xaligned_alloc(16, DISTRECIPSIZ * sizeof(uint32_t)); ++ posix_memalign(&distrecip, 16, DISTRECIPSIZ * sizeof(uint32_t)); + + if (xdimen < 1 << 11) + { +@@ -11654,7 +11655,7 @@ static void initsmost(void) + if (*dynarray[i].ptr) + Baligned_free(*dynarray[i].ptr); + +- *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size); ++ posix_memalign(dynarray[i].ptr, 16, dynarray[i].size); + } + + ysavecnt = YSAVES; Property changes on: files/patch-build_src_engine.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property