Attachment 163470 Details for Bug 202998 – regenerated against r5434

[patch] regenerated against r5434

file_202998.txt (text/plain), 13.24 KB, created by Piotr Kubaj on 2015-11-24 11:54:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2015-11-24 11:54:05 UTC

Size: 13.24 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 402354)
>+++ MOVED	(working copy)
>@@ -7946,3 +7946,4 @@
> www/py3-aiohttp|www/py-aiohttp|2015-11-21|Duplicate port
> textproc/kibana4|textproc/kibana41|2015-11-22|Distinguish from incompatible kibana42
> devel/qsvn||2015-11-23|Has expired: Development discontinued since 2009
>+games/duke3d-data||2015-11-24|Incorporated into games/eduke32
>Index: games/Makefile
>===================================================================
>--- games/Makefile	(revision 402354)
>+++ games/Makefile	(working copy)
>@@ -212,7 +212,6 @@
>     SUBDIR += dsnake
>     SUBDIR += duckmaze
>     SUBDIR += duel
>-    SUBDIR += duke3d-data
>     SUBDIR += dunelegacy
>     SUBDIR += dungeon
>     SUBDIR += dungeoncrawl
>Index: games/duke3d-data/Makefile
>===================================================================
>--- games/duke3d-data/Makefile	(revision 402354)
>+++ games/duke3d-data/Makefile	(working copy)
>@@ -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>
>Index: games/duke3d-data/Makefile.include
>===================================================================
>--- games/duke3d-data/Makefile.include	(revision 402354)
>+++ games/duke3d-data/Makefile.include	(working copy)
>@@ -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
>Index: games/duke3d-data/distinfo
>===================================================================
>--- games/duke3d-data/distinfo	(revision 402354)
>+++ games/duke3d-data/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (3dduke13.zip) = c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
>-SIZE (3dduke13.zip) = 5924374
>Index: games/duke3d-data/files/pkg-message.in
>===================================================================
>--- games/duke3d-data/files/pkg-message.in	(revision 402354)
>+++ games/duke3d-data/files/pkg-message.in	(working copy)
>@@ -1,9 +0,0 @@
>-==============================================================================
>-
>-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%%".
>-
>-There is a high resolution pack at "http://hrp.duke4.net/".
>-
>-==============================================================================
>Index: games/duke3d-data/pkg-descr
>===================================================================
>--- games/duke3d-data/pkg-descr	(revision 402354)
>+++ games/duke3d-data/pkg-descr	(working copy)
>@@ -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/
>Index: games/duke3d-data/pkg-plist
>===================================================================
>--- games/duke3d-data/pkg-plist	(revision 402354)
>+++ games/duke3d-data/pkg-plist	(working copy)
>@@ -1,2 +0,0 @@
>-%%DATADIR%%/.keepme
>-%%SHAREWARE%%%%DATADIR%%/duke3d.grp
>Index: games/eduke32/Makefile
>===================================================================
>--- games/eduke32/Makefile	(revision 402354)
>+++ games/eduke32/Makefile	(working copy)
>@@ -2,11 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	eduke32
>-PORTVERSION=	20150830
>+PORTVERSION=	20151120
> 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_GNOME=	gtk20
> USE_SDL=	sdl2 mixer2
> WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
>-SVNREVISION=	5338
>+SVNREVISION=	5434
>+DATADIR=	${LOCALBASE}/share/duke3d
>+SUB_FILES=	pkg-message
>+SUB_LIST=	DATADIR=${DATADIR}
> 
> PLIST_FILES=	bin/eduke32 bin/mapster32
> PORTDOCS=	*
>@@ -33,7 +36,7 @@
> 
> 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,14 +44,49 @@
> 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}|' \
> 		${WRKSRC}/Makefile.common
>@@ -73,4 +111,16 @@
> 	${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>
>Index: games/eduke32/distinfo
>===================================================================
>--- games/eduke32/distinfo	(revision 402354)
>+++ games/eduke32/distinfo	(working copy)
>@@ -1,2 +1,6 @@
>-SHA256 (eduke32_src_20150830-5338.tar.xz) = 122375d58eb800e6b1eb4856757fccc3c6f463e5b724a866afc7ab6d84b1a0c2
>-SIZE (eduke32_src_20150830-5338.tar.xz) = 14328856
>+SHA256 (eduke32_src_20151120-5434.tar.xz) = 777998210eee735bed6e831f87a48e8d34ef6d8c969493289991f664acbc6560
>+SIZE (eduke32_src_20151120-5434.tar.xz) = 14347556
>+SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5
>+SIZE (duke3d_hrp.zip) = 933440151
>+SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534
>+SIZE (duke3d_xxx.zip) = 26586453
>Index: games/eduke32/files/patch-Makefile.common
>===================================================================
>--- games/eduke32/files/patch-Makefile.common	(revision 402354)
>+++ games/eduke32/files/patch-Makefile.common	(working copy)
>@@ -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
>Index: games/eduke32/files/patch-build_src_engine.c
>===================================================================
>--- games/eduke32/files/patch-build_src_engine.c	(revision 402354)
>+++ games/eduke32/files/patch-build_src_engine.c	(working copy)
>@@ -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);
>Index: games/eduke32/files/pkg-message.in
>===================================================================
>--- games/eduke32/files/pkg-message.in	(revision 0)
>+++ games/eduke32/files/pkg-message.in	(working copy)
>@@ -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.
>+
>+==============================================================================
>
>Property changes on: games/eduke32/files/pkg-message.in
>___________________________________________________________________
>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

Flags:

pkubaj: maintainer-approval+

Actions: View | Diff

Attachments on bug 202998: 160868 | 160873 | 161843 | 162276 | 163470 | 165094