Date: Tue, 26 Aug 2003 03:30:14 -0700 (PDT) From: "Guy Coleman" <gtchask@mm.st> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/55508: [PATCH] update of games/freeciv to 1.14 Message-ID: <200308261030.h7QAUEsu053627@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/55508; it has been noted by GNATS.
From: "Guy Coleman" <gtchask@mm.st>
To: freebsd-gnats-submit@freebsd.org
Cc: rehsack@liwing.de
Subject: Re: ports/55508: [PATCH] update of games/freeciv to 1.14
Date: Tue, 26 Aug 2003 11:24:55 +0100
ports/54502 includes this update and adds SDL_mixer and ESound support.
Also, adding the CONFIGURE_TARGET means that the REINPLACE_CMD in
post-patch isn't needed.
I've fixed up the patch so it works, and included it below. Sorry for any
tab/spacing mess, I had to paste this into a webmail interface.
----------
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308261030.h7QAUEsu053627>