ports/122129: [patch] games/eduke32 : up-to-date snapshot

[Olivier Smedts]

>Number:         122129
>Category:       ports
>Synopsis:       [patch] games/eduke32 : up-to-date snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 26 20:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Smedts
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
gid0.org
>Environment:
System: FreeBSD z.gid0.org 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Mar 2 21:13:45 CET 2008 root at z.gid0.org:/work/obj/work/src/sys/XPC i386


	
>Description:
Update port to use latest snapshot, sync OPTIONS with audio/sdl_mixer, little cleanup.

	
>How-To-Repeat:
	
>Fix:
Note : after applying this patch, games/eduke32/files directory should be deleted.

	

--- patch begins here ---
--- distinfo.old	2008-03-26 18:53:57.000000000 +0100
+++ distinfo	2008-03-26 18:55:21.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (eduke32_src_20080206.zip) = 2706f66ea5a043e5020a6b5960c72594
-SHA256 (eduke32_src_20080206.zip) = a1d0d3fb47cb1eb21f5a299bc257ca0edb0ae91c6b7491690017418220825027
-SIZE (eduke32_src_20080206.zip) = 1523615
+MD5 (eduke32_src_20080322.zip) = 521ecbce0624a66086264c2f66a42dd5
+SHA256 (eduke32_src_20080322.zip) = 33d81f05e6ebbed0061a8337746b1d711b0e663172d3445de72de40b4a844779
+SIZE (eduke32_src_20080322.zip) = 1600116
diff -N -u files.old/patch-Makefile files/patch-Makefile
--- files.old/patch-Makefile	2008-02-16 22:38:12.000000000 +0100
+++ files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
---- Makefile.orig	2007-10-10 23:28:16.000000000 +0200
-+++ Makefile	2007-10-10 23:30:35.000000000 +0200
-@@ -51,18 +51,18 @@
- 
- include $(EROOT)/Makefile.shared
- 
--ifeq ($(PLATFORM),LINUX)
-+ifeq ($(PLATFORM),WINDOWS)
-+	OBJ=obj_win
-+	EOBJ=eobj_win
-+else
- 	OBJ=obj
- 	EOBJ=eobj
--	NASMFLAGS+= -f elf
--else
--    ifeq ($(PLATFORM),WINDOWS)
--	    OBJ=obj_win
--	    EOBJ=eobj_win
--    else
--    	OBJ=obj
--    	EOBJ=eobj
--    endif
-+	ifeq ($(PLATFORM),LINUX)
-+		NASMFLAGS+= -f elf
-+	endif
-+	ifeq ($(PLATFORM),BSD)
-+		NASMFLAGS+= -f elf
-+	endif
- endif
- 
- JMACTOBJ=$(OBJ)/util_lib.$o \
--- Makefile.old	2008-03-26 18:53:54.000000000 +0100
+++ Makefile	2008-03-26 20:47:11.000000000 +0100
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/games/eduke32/Makefile,v 1.10 2008/03/13 14:27:38 miwi Exp $
 
 PORTNAME=	eduke32
-PORTVERSION=	20080206
-PORTREVISION=	1
+PORTVERSION=	20080322
 CATEGORIES=	games
 MASTER_SITES=	http://wiki.eduke32.com/stuff/
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX}
@@ -21,7 +20,9 @@
 USE_SDL=	mixer sdl
 WRKSRC=		${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME}
 
-OPTIONS=	MIDI "Enable MIDI support" on
+OPTIONS=	MIDI		"Enable MIDI support"			On \
+		TIMIDITYPLUS	"Use Timidity++ instead of Timidity"	Off \
+		VORBIS		"Enable Ogg Vorbis support"		On
 
 .include "${.CURDIR}/../duke3d-data/Makefile.include"
 
@@ -31,9 +32,17 @@
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-.if !defined(WITHOUT_MIDI)
+.if defined(WITH_MIDI)
+.if defined(WITH_TIMIDITYPLUS)
+RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity++
+.else
 RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
 .endif
+.endif
+
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+.endif
 
 post-patch:
 .if ${ARCH} != "i386"
@@ -47,6 +56,7 @@
 		${WRKSRC}/Makefile \
 		${WRKSRC}/../build/Makefile \
 		${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
 
--- patch ends here ---


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