From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 29 02:10:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D06E16A4DD for ; Sat, 29 Jul 2006 02:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65C1243D5C for ; Sat, 29 Jul 2006 02:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6T2AEJu037788 for ; Sat, 29 Jul 2006 02:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6T2AEfj037784; Sat, 29 Jul 2006 02:10:14 GMT (envelope-from gnats) Resent-Date: Sat, 29 Jul 2006 02:10:14 GMT Resent-Message-Id: <200607290210.k6T2AEfj037784@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, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C141C16A4E2 for ; Sat, 29 Jul 2006 02:06:39 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by mx1.FreeBSD.org (Postfix) with SMTP id 456B343D55 for ; Sat, 29 Jul 2006 02:06:39 +0000 (GMT) (envelope-from alepulver@FreeBSD.org) Received: (qmail 95425 invoked from network); 29 Jul 2006 02:06:37 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 29 Jul 2006 02:06:37 -0000 Message-Id: <1154138832.94274@phobos.mars.bsd> Date: Fri, 28 Jul 2006 23:07:12 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/101011: [UPDATE] games/quetoo: follow changes in games/quake2-data X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 02:10:15 -0000 >Number: 101011 >Category: ports >Synopsis: [UPDATE] games/quetoo: follow changes in games/quake2-data >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: Sat Jul 29 02:10:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE-p1 #3: Mon Jun 19 14:49:35 ART 2006 root@phobos.mars.bsd:/usr/obj/usr/src/sys/ATHLON-PHOBOS >Description: - Bump PORTREVISION. - Add GAME and CTF options (disabled by default because provided by "games/quake2-data" and "games/quake2-ctf" respectively). >How-To-Repeat: >Fix: --- quetoo.diff begins here --- ? quetoo/files/patch-src__files.c Index: quetoo/Makefile =================================================================== RCS file: /home/pcvs/ports/games/quetoo/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- quetoo/Makefile 6 Jul 2006 10:07:26 -0000 1.7 +++ quetoo/Makefile 29 Jul 2006 02:05:15 -0000 @@ -7,6 +7,7 @@ PORTNAME= quetoo PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://jdolan.dyndns.org/jaydolan/files/ \ http://freebsd.nsu.ru/distfiles/ @@ -18,16 +19,17 @@ USE_SDL= sdl USE_GL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ - ${PTHREAD_CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib \ - -L${X11BASE}/lib ${PTHREAD_LIBS}" \ - OPENGL_CFLAGS="-I${X11BASE}/include" \ - OPENGL_LIBS="-L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ + OPENGL_CFLAGS="${CPPFLAGS}" OPENGL_LIBS="${LDFLAGS}" +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} LIBDIR= ${PREFIX}/lib/${PORTNAME} -PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}" +PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" -OPTIONS= QMASS "Build QMass deathmatch mod" on \ +OPTIONS= GAME "Build a main game .so file (required)" on \ + CTF "Build the Capture The Flag modification" off \ + QMASS "Build QMass deathmatch mod" on \ MYSQL "Enable MySQL frag logging" off \ OPTIMIZED_CFLAGS "Enable extra optimization options" off @@ -43,26 +45,42 @@ . endif .endif +.if !defined(WITHOUT_GAME) +PLIST_SUB+= GAME="" +Q2GAMES+= baseq2 +.else +PLIST_SUB+= GAME="@comment " +Q2GAMES_NOT+= baseq2 +.endif + +.if defined(WITH_CTF) +PLIST_SUB+= CTF="" +Q2GAMES+= ctf +.else +PLIST_SUB+= CTF="@comment " +Q2GAMES_NOT+= ctf +.endif + .if !defined(WITHOUT_QMASS) -Q2GAMES= baseq2 ctf qmass CONFIGURE_ARGS+= --enable-qmass PLIST_SUB+= QMASS="" +Q2GAMES+= qmass .else -Q2GAMES= baseq2 ctf PLIST_SUB+= QMASS="@comment " +Q2GAMES_NOT+= qmass .endif .if defined(WITH_MYSQL) USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql +CONFIGURE_ARGS+=--with-mysql CONFIGURE_ENV+= MYSQL_LIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient" \ MYSQL_CFLAGS="-I${LOCALBASE}/include" .else -CONFIGURE_ARGS+= --without-mysql +CONFIGURE_ARGS+=--without-mysql .endif .if !defined(WITH_OPTIMIZED_CFLAGS) -CONFIGURE_ARGS+= --disable-opt --disable-sse +CONFIGURE_ARGS+=--disable-opt --disable-sse .endif post-extract: .SILENT @@ -70,6 +88,10 @@ s,sdl-config,${SDL_CONFIG},' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's,-ldl,,' ${WRKSRC}/src/Makefile.in ${REINPLACE_CMD} -e 's,alsa,sdl,' ${WRKSRC}/src/snd_ref.c +.for f in ${Q2GAMES_NOT} + ${REINPLACE_CMD} -i "" -Ee 's,^(SRC_SUBDIRS=".*)${f}(.*),\1\2,' \ + ${WRKSRC}/configure +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/quetoo ${PREFIX}/bin/quetoo Index: quetoo/pkg-plist =================================================================== RCS file: /home/pcvs/ports/games/quetoo/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- quetoo/pkg-plist 6 Jul 2006 10:02:05 -0000 1.2 +++ quetoo/pkg-plist 29 Jul 2006 02:05:15 -0000 @@ -1,6 +1,6 @@ bin/quetoo -%%LIBDIR%%/baseq2/game.so -%%LIBDIR%%/ctf/game.so +%%GAME%%%%LIBDIR%%/baseq2/game.so +%%CTF%%%%LIBDIR%%/ctf/game.so %%QMASS%%%%LIBDIR%%/qmass/game.so %%LIBDIR%%/vid_glsdl.so %%LIBDIR%%/vid_glx.so @@ -10,7 +10,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%QMASS%%%%PORTDOCS%%%%DOCSDIR%%/qmass-README %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%LIBDIR%%/baseq2 -@dirrm %%LIBDIR%%/ctf +%%GAME%%@dirrm %%LIBDIR%%/baseq2 +%%CTF%%@dirrm %%LIBDIR%%/ctf %%QMASS%%@dirrm %%LIBDIR%%/qmass @dirrm %%LIBDIR%% --- quetoo.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: