ports/146872: [maintainer-update] [patch] games/eduke32 : update to recent snapshot

[Olivier Smedts]

>Number:         146872
>Category:       ports
>Synopsis:       [maintainer-update] [patch] games/eduke32 : update to recent snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 23 22:06:52 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Smedts
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD q.gid0.org 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0 r208354M: Thu May 20 20:40:48 CEST 2010 root at q.gid0.org:/usr/obj/usr/src/sys/QUAD amd64


	
>Description:

Update to recent snapshot with a new lighting rendering engine. Compatible with latest High Resolution Pack.
	
>How-To-Repeat:
	
>Fix:
The files/ subdir should be removed, patches have been integrated upstream.
	

--- patch begins here ---
diff -rNu /usr/ports/games/eduke32/Makefile games/eduke32/Makefile
--- /usr/ports/games/eduke32/Makefile	2010-03-28 08:34:48.000000000 +0200
+++ games/eduke32/Makefile	2010-05-23 17:04:44.667330271 +0200
@@ -5,26 +5,21 @@
 # $FreeBSD: ports/games/eduke32/Makefile,v 1.24 2010/03/28 06:34:48 dinoex Exp $
 
 PORTNAME=	eduke32
-PORTVERSION=	20090313
-PORTREVISION=	2
-DISTVERSION=	20090131
-PORTREVISION=	2
+PORTVERSION=	20100520
+SVNREVISION=	1647
 CATEGORIES=	games
-MASTER_SITES=	http://dukeworld.duke4.net/eduke32/source_code/
-DISTFILES=	${PORTNAME}_src_${DISTVERSION}${EXTRACT_SUFX}
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${PORTNAME}_src_${PORTVERSION}.diff
+MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/
+DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}
 
 MAINTAINER=	olivier at gid0.org
 COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
 
-USE_ZIP=	yes
+USE_GZIP=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_GNOME=	gtk20
 USE_SDL=	mixer sdl
-WRKSRC=		${WRKDIR}/${PORTNAME}_src_${DISTVERSION}
-PATCH_ARGS=	-d ${PATCH_WRKSRC} --forward --quiet -E ${PATCH_STRIP} -l
+WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
 
 OPTIONS=	MIDI		"Enable original MIDI music support"	On \
 		TIMIDITYPLUS	"Use Timidity++ instead of Timidity"	Off \
@@ -64,15 +59,17 @@
 	@${REINPLACE_CMD} -Ee \
 		's|^(CC=).*|\1${CC}|; \
 		 s|^(CXX=).*|\1${CXX}|; \
-		 /debug=/d; \
-		 s|/usr/X11R6|${LOCALBASE}|; \
-		 s|sdl-config|${SDL_CONFIG}|' \
-		${WRKSRC}/Makefile \
-		${WRKSRC}/build/Makefile \
-		${WRKSRC}/build/Makefile.shared
+		 s|-ldl ||; \
+		 /debug=/d;' \
+		${WRKSRC}/Makefile ${WRKSRC}/build/Makefile
 	@${REINPLACE_CMD} -e 's|LINUX|BSD|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/build/Makefile
+	@${REINPLACE_CMD} -Ee 's|(SDLCONFIG[[:space:]]*=).*|\1${SDL_CONFIG}|' \
+		${WRKSRC}/build/Makefile.shared
 	@${REINPLACE_CMD} -e 's|/usr/share/games/eduke32|${DN3DDIR}|' \
 		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
+	@${REINPLACE_CMD} -e 's|-Iinclude|-Iinclude -I/usr/local/include|' \
+		${WRKSRC}/source/jaudiolib/Makefile
 
 do-install:
 .for f in eduke32 mapster32
diff -rNu /usr/ports/games/eduke32/distinfo games/eduke32/distinfo
--- /usr/ports/games/eduke32/distinfo	2009-08-07 19:50:45.000000000 +0200
+++ games/eduke32/distinfo	2010-05-21 17:49:18.232727337 +0200
@@ -1,6 +1,3 @@
-MD5 (eduke32_src_20090131.zip) = cf5eb51de024f28e8b24aae2702d459e
-SHA256 (eduke32_src_20090131.zip) = e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d
-SIZE (eduke32_src_20090131.zip) = 1694234
-MD5 (eduke32_src_20090313.diff) = fd9fa13146c9a31b2eb709aff93a4afa
-SHA256 (eduke32_src_20090313.diff) = de13b9600868b98195c18a138fe6dd27fd29f054035ec966d03d28a220b472be
-SIZE (eduke32_src_20090313.diff) = 113568
+MD5 (eduke32_src_20100520-1647.tar.gz) = 334ed2d588261c644fa96e21b48ae082
+SHA256 (eduke32_src_20100520-1647.tar.gz) = 21554edc033f6972f45358292f4c7d9f58480823f61cbe2ff23b9dc88b6d1ef8
+SIZE (eduke32_src_20100520-1647.tar.gz) = 1907983
diff -rNu /usr/ports/games/eduke32/files/patch-build-src-mmulti_unstable.c games/eduke32/files/patch-build-src-mmulti_unstable.c
--- /usr/ports/games/eduke32/files/patch-build-src-mmulti_unstable.c	2009-08-07 19:50:46.000000000 +0200
+++ games/eduke32/files/patch-build-src-mmulti_unstable.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- build/src/mmulti_unstable.c.orig	2009-02-02 23:21:58.000000000 +0100
-+++ build/src/mmulti_unstable.c	2009-02-02 23:27:30.000000000 +0100
-@@ -971,7 +971,11 @@
-     {
-         /* !!! FIXME: Might be Linux (not Unix, not BSD, not WinSock) specific. */
-         int32_t flags = 1;
--        setsockopt(udpsocket, SOL_IP, IP_RECVERR, &flags, sizeof(flags));
-+        int sol_ip;
-+        struct protoent *pent;
-+        pent = getprotobyname ("ip");
-+        sol_ip = (pent != NULL) ? pent->p_proto : 0;
-+        setsockopt(udpsocket, sol_ip, SO_ERROR, &flags, sizeof(flags));
-     }
- #endif 
diff -rNu /usr/ports/games/eduke32/files/patch-source-jaudiolib-dsl.c games/eduke32/files/patch-source-jaudiolib-dsl.c
--- /usr/ports/games/eduke32/files/patch-source-jaudiolib-dsl.c	2009-08-07 19:50:46.000000000 +0200
+++ games/eduke32/files/patch-source-jaudiolib-dsl.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- source/jaudiolib/dsl.c.orig	2009-02-02 23:13:40.000000000 +0100
-+++ source/jaudiolib/dsl.c	2009-02-02 23:13:53.000000000 +0100
-@@ -22,6 +22,7 @@
- */
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- 
- #include "dsl.h"
- #include "compat.h"
--- patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: