Date: Tue, 3 Jun 2008 13:01:12 +0200 (CEST) From: Olivier Smedts <olivier@gid0.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124231: [MAINTAINER] [UPDATE] games/eduke32 : new snapshot and some fixes/changes Message-ID: <20080603110112.DF98222828@z.gid0.org> Resent-Message-ID: <200806031110.m53BA1xw039753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124231 >Category: ports >Synopsis: [MAINTAINER] [UPDATE] games/eduke32 : new snapshot and some fixes/changes >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: Tue Jun 03 11:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Olivier Smedts >Release: FreeBSD 7.0-RELEASE-p1 i386 >Organization: gid0.org >Environment: System: FreeBSD z.gid0.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Sun May 4 20:25:51 CEST 2008 root@z.gid0.org:/work/obj/work/src/sys/XPC i386 >Description: - Update to newest upstream snapshot, compatible with latest High Res Pack Update (http://hrpupdate.duke4.net) - Replace files/patch-Makefile with REINPLACE_CMD - Fix build without libvorbis and co - Add an option to depend on timidity++ instead of timidity, to be in sync with OPTIONS of audio/sdl_mixer >How-To-Repeat: N/A >Fix: Apply attached patch. Remove games/eduke32/files directory. --- eduke32.patch begins here --- diff -ruN games/eduke32.orig/Makefile games/eduke32/Makefile --- games/eduke32.orig/Makefile 2008-06-03 11:30:55.000000000 +0200 +++ games/eduke32/Makefile 2008-06-03 11:00:37.000000000 +0200 @@ -5,8 +5,7 @@ # $FreeBSD: ports/games/eduke32/Makefile,v 1.11 2008/04/19 17:48:58 miwi Exp $ PORTNAME= eduke32 -PORTVERSION= 20080206 -PORTREVISION= 1 +PORTVERSION= 20080602 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,11 +32,22 @@ 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 defined(WITHOUT_VORBIS) + @${REINPLACE_CMD} -e '/LIBS+= -lvorbis/d' ${WRKSRC}/Makefile +.endif .if ${ARCH} != "i386" @${REINPLACE_CMD} -Ee 's|^(NOASM =).*|\1 1|' ${WRKSRC}/Makefile .endif @@ -47,6 +59,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 diff -ruN games/eduke32.orig/distinfo games/eduke32/distinfo --- games/eduke32.orig/distinfo 2008-06-03 11:30:55.000000000 +0200 +++ games/eduke32/distinfo 2008-06-03 11:04:01.000000000 +0200 @@ -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_20080602.zip) = c478f1f98c1ac57844604a1ba8c98997 +SHA256 (eduke32_src_20080602.zip) = 0b98ef85548015f199a4253521f1bc82d80f63977b5b94fbaf55924b912950ab +SIZE (eduke32_src_20080602.zip) = 1629666 diff -ruN games/eduke32.orig/files/patch-Makefile games/eduke32/files/patch-Makefile --- games/eduke32.orig/files/patch-Makefile 2008-06-03 11:30:55.000000000 +0200 +++ games/eduke32/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 \ --- eduke32.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080603110112.DF98222828>