From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 26 20:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D348106566B for ; Wed, 26 Mar 2008 20:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EC7A28FC1A for ; Wed, 26 Mar 2008 20:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2QKU1LR030842 for ; Wed, 26 Mar 2008 20:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2QKU1ki030841; Wed, 26 Mar 2008 20:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 26 Mar 2008 20:30:01 GMT Resent-Message-Id: <200803262030.m2QKU1ki030841@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olivier Smedts Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0411D1065674 for ; Wed, 26 Mar 2008 20:22:23 +0000 (UTC) (envelope-from zozo@z.gid0.org) Received: from postfix2-g20.free.fr (postfix2-g20.free.fr [212.27.60.43]) by mx1.freebsd.org (Postfix) with ESMTP id 944108FC2B for ; Wed, 26 Mar 2008 20:22:22 +0000 (UTC) (envelope-from zozo@z.gid0.org) Received: from smtp4-g19.free.fr (smtp4-g19.free.fr [212.27.42.30]) by postfix2-g20.free.fr (Postfix) with ESMTP id 5363E24C4017 for ; Wed, 26 Mar 2008 19:02:31 +0100 (CET) Received: from smtp4-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp4-g19.free.fr (Postfix) with ESMTP id 28DB43EA13E for ; Wed, 26 Mar 2008 21:02:58 +0100 (CET) Received: from z.gid0.org (s.gid0.org [88.163.116.140]) by smtp4-g19.free.fr (Postfix) with ESMTP id 0011A3EA0ED for ; Wed, 26 Mar 2008 21:02:57 +0100 (CET) Received: by z.gid0.org (Postfix, from userid 1001) id 7D19E2280F; Wed, 26 Mar 2008 21:00:10 +0100 (CET) Message-Id: <20080326200010.7D19E2280F@z.gid0.org> Date: Wed, 26 Mar 2008 21:00:10 +0100 (CET) From: Olivier Smedts To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/122129: [patch] games/eduke32 : up-to-date snapshot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Olivier Smedts List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2008 20:30:02 -0000 >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@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: