Date: Tue, 2 Sep 2003 12:43:46 +0100 From: "Guy Coleman" <gtchask@mm.st> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56307: [PATCH] esound, sdl support for games/freeciv Message-ID: 1062503025@fire.alarm Resent-Message-ID: <200309021150.h82BoIVS059370@freefall.freebsd.org>
| raw e-mail | index | archive | help
>Number: 56307
>Category: ports
>Synopsis: [PATCH] esound, sdl support for games/freeciv
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 02 04:50:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Guy Coleman
>Release: FreeBSD 5.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD fire.alarm 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #2: Mon Aug 11 23:34:22 BST 2003 gtc00u@fire.alarm:/usr/obj/usr/src/sys/FIRE i386
>Description:
Add SDL_mixer and ESound support. Also, adding the CONFIGURE_TARGET means that the REINPLACE_CMD in post-patch isn't needed.
ports/54502 can also be closed as the update to 1.14.0 has already been committed.
>How-To-Repeat:
-
>Fix:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/freeciv/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile 26 Aug 2003 08:19:34 -0000 1.53
+++ Makefile 26 Aug 2003 10:13:43 -0000
@@ -20,7 +20,7 @@
USE_XPM= yes
USE_BZIP2= yes
WANT_GNOME= yes
-USE_REINPLACE= yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -34,7 +34,31 @@
LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
-post-patch:
- cd ${WRKSRC}; ${FIND} . -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
+.if ${HAVE_GNOME:Mesound}!=""
+WITH_ESOUND= yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libSDL_mixer.so)
+WITH_SDL_MIXER= yes
+.endif
+
+.if defined(WITH_ESOUND)
+USE_GNOME+= esound
+CONFIGURE_ARGS+=--enable-esound --disable-sdl-mixer
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
+.else
+PKGNAMESUFFIX= -esound
+.endif
+.elif defined(WITH_SDL_MIXER)
+LIB_DEPENDS+= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
+CONFIGURE_ARGS+=--enable-sdl-mixer --disable-esound
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sdl-mixer
+.else
+PKGNAMESUFFIX= -sdl-mixer
+.endif
+.endif
.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1062503025>