ports/156932: [maintainer-update] [patch] games/eduke32 : new snapshot

[Olivier Smedts]

>Number:         156932
>Category:       ports
>Synopsis:       [maintainer-update] [patch] games/eduke32 : new 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:   Tue May 10 17:10:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Smedts
>Release:        9.0-CURRENT
>Organization:
gid0.org
>Environment:
FreeBSD q.gid0.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r221445: Wed May  4 19:59:30 CEST 2011     root at q.gid0.org:/usr/obj/usr/src/sys/QUAD  amd64

>Description:
Here is a diff to update the eduke32 port to the latest upstream snapshot.

It brings the new polymer renderer with per-pixel dynamic lighting and realtime shadows, and is compatible with the latest high resolution pack that you can get on http://hrp.duke4.net/
>How-To-Repeat:

>Fix:
Apply the patch, remove the empty "files" subdir.

Patch attached with submission follows:

diff -rNu games/eduke32/Makefile /home/zozo/ports/games/eduke32/Makefile
--- games/eduke32/Makefile	2010-06-06 22:43:45.000000000 +0200
+++ /home/zozo/ports/games/eduke32/Makefile	2011-05-04 18:21:33.896470057 +0200
@@ -2,28 +2,28 @@
 # Date Created:				1 Aug 2006
 # Whom:					alepulver
 #
-# $FreeBSD: ports/games/eduke32/Makefile,v 1.25 2010/06/06 20:43:45 naddy Exp $
+# $FreeBSD: ports/games/eduke32/Makefile,v 1.24 2010/03/28 06:34:48 dinoex Exp $
 
 PORTNAME=	eduke32
-PORTVERSION=	20090313
-PORTREVISION=	3
-DISTVERSION=	20090131
+PORTVERSION=	20110502
+SVNREVISION=	1876
 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}/ \
+		http://dukeworld.duke4.net/eduke32/synthesis/old/${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
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/GNU.TXT
+
+USE_BZIP2=	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 \
@@ -58,27 +58,28 @@
 	@${REINPLACE_CMD} -e '/LIBS+= -lvorbis/d' ${WRKSRC}/Makefile
 .endif
 .if ${ARCH} != "i386"
-	@${REINPLACE_CMD} -Ee 's|^(NOASM =).*|\1 1|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -Ee 's|^(NOASM =).*|\1 1|' ${WRKSRC}/Makefile.common
 .endif
-	@${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 \
+	@${REINPLACE_CMD} -Ee 's|^(CC=).*|\1${CC}|' -e 's|^(CXX=).*|\1${CXX}|' \
+		-e 's| \$$\(ARCH\)||' -e '/debug=/d' \
+		${WRKSRC}/Makefile ${WRKSRC}/build/Makefile
+	@${REINPLACE_CMD} -Ee 's|LINUX|BSD|' -e 's| -ldl||' \
+		-e 's|(\+= -lvorbisfile)|\1 -lexecinfo|' ${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|LINUX|BSD|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/share/games/eduke32|${DN3DDIR}|' \
 		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
+	@${REINPLACE_CMD} -Ee 's|(-DHAVE_VORBIS)|-I/usr/local/include \1|' \
+		${WRKSRC}/source/jaudiolib/Makefile
+	@${REINPLACE_CMD} -e '/int socklen_t/d' ${WRKSRC}/source/enet/src/unix.c
 
 do-install:
 .for f in eduke32 mapster32
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
 .if !defined(NOPORTDOCS)
-. for f in ChangeLog *.sample
+. for f in ChangeLog samples/*
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 . endfor
diff -rNu games/eduke32/distinfo /home/zozo/ports/games/eduke32/distinfo
--- games/eduke32/distinfo	2009-08-07 19:50:45.000000000 +0200
+++ /home/zozo/ports/games/eduke32/distinfo	2011-05-04 00:00:20.482551998 +0200
@@ -1,6 +1,2 @@
-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
+SHA256 (eduke32_src_20110502-1876.tar.bz2) = 2565721dad4e634a290c4b1a8971334a378eb697ac2b61c7e5ee82bf55d9504b
+SIZE (eduke32_src_20110502-1876.tar.bz2) = 2791177
diff -rNu games/eduke32/files/patch-build-src-mmulti_unstable.c /home/zozo/ports/games/eduke32/files/patch-build-src-mmulti_unstable.c
--- games/eduke32/files/patch-build-src-mmulti_unstable.c	2009-08-07 19:50:46.000000000 +0200
+++ /home/zozo/ports/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 games/eduke32/files/patch-source-jaudiolib-dsl.c /home/zozo/ports/games/eduke32/files/patch-source-jaudiolib-dsl.c
--- games/eduke32/files/patch-source-jaudiolib-dsl.c	2009-08-07 19:50:46.000000000 +0200
+++ /home/zozo/ports/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"


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