From owner-svn-ports-head@freebsd.org Wed Jan 6 16:01:01 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40E8DA4EDE5; Wed, 6 Jan 2016 16:01:01 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D3DC12E2; Wed, 6 Jan 2016 16:01:01 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u06G10Y6007772; Wed, 6 Jan 2016 16:01:00 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u06G0xGx007757; Wed, 6 Jan 2016 16:00:59 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201601061600.u06G0xGx007757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Wed, 6 Jan 2016 16:00:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405364 - in head: . games games/duke3d-data games/eduke32 games/eduke32/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2016 16:01:01 -0000 Author: riggs Date: Wed Jan 6 16:00:59 2016 New Revision: 405364 URL: https://svnweb.freebsd.org/changeset/ports/405364 Log: 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) Added: head/games/eduke32/files/pkg-message.in (contents, props changed) Deleted: head/games/duke3d-data/ Modified: head/MOVED head/games/Makefile head/games/eduke32/Makefile head/games/eduke32/distinfo head/games/eduke32/files/patch-Makefile.common head/games/eduke32/files/patch-build_src_engine.c Modified: head/MOVED ============================================================================== --- head/MOVED Wed Jan 6 15:55:40 2016 (r405363) +++ head/MOVED Wed Jan 6 16:00:59 2016 (r405364) @@ -8094,3 +8094,4 @@ misc/kde4-l10n-th||2016-01-01|Has expire 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 Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Wed Jan 6 15:55:40 2016 (r405363) +++ head/games/Makefile Wed Jan 6 16:00:59 2016 (r405364) @@ -212,7 +212,6 @@ SUBDIR += dsnake SUBDIR += duckmaze SUBDIR += duel - SUBDIR += duke3d-data SUBDIR += dunelegacy SUBDIR += dungeon SUBDIR += dungeoncrawl Modified: head/games/eduke32/Makefile ============================================================================== --- head/games/eduke32/Makefile Wed Jan 6 15:55:40 2016 (r405363) +++ head/games/eduke32/Makefile Wed Jan 6 16:00:59 2016 (r405364) @@ -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 + +.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 Modified: head/games/eduke32/distinfo ============================================================================== --- head/games/eduke32/distinfo Wed Jan 6 15:55:40 2016 (r405363) +++ head/games/eduke32/distinfo Wed Jan 6 16:00:59 2016 (r405364) @@ -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 Modified: head/games/eduke32/files/patch-Makefile.common ============================================================================== --- head/games/eduke32/files/patch-Makefile.common Wed Jan 6 15:55:40 2016 (r405363) +++ head/games/eduke32/files/patch-Makefile.common Wed Jan 6 16:00:59 2016 (r405364) @@ -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 Modified: head/games/eduke32/files/patch-build_src_engine.c ============================================================================== --- head/games/eduke32/files/patch-build_src_engine.c Wed Jan 6 15:55:40 2016 (r405363) +++ head/games/eduke32/files/patch-build_src_engine.c Wed Jan 6 16:00:59 2016 (r405364) @@ -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); Added: head/games/eduke32/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/eduke32/files/pkg-message.in Wed Jan 6 16:00:59 2016 (r405364) @@ -0,0 +1,11 @@ +============================================================================== + +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%%, 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. + +If you installed the XXX Pack, you need to include both HRP and XXX Packs. + +==============================================================================