From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 22 23:00:34 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 0EDF116A420 for ; Wed, 22 Feb 2006 23:00:34 +0000 (GMT) (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 728BF43D5E for ; Wed, 22 Feb 2006 23:00:29 +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 k1MN0TrI054890 for ; Wed, 22 Feb 2006 23:00:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1MN0TIE054889; Wed, 22 Feb 2006 23:00:29 GMT (envelope-from gnats) Resent-Date: Wed, 22 Feb 2006 23:00:29 GMT Resent-Message-Id: <200602222300.k1MN0TIE054889@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 8D19216A420 for ; Wed, 22 Feb 2006 22:58:48 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay00.pair.com (relay00.pair.com [209.68.5.9]) by mx1.FreeBSD.org (Postfix) with SMTP id B1C8E43D5D for ; Wed, 22 Feb 2006 22:58:47 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 73467 invoked from network); 22 Feb 2006 22:58:46 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 22 Feb 2006 22:58:46 -0000 Message-Id: <1140649130.94356@phobos.mars.bsd> Date: Wed, 22 Feb 2006 19:58:50 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/93729: [MAINTAINER UPDATE] games/quakeforge: fix data directory (wasn't loading its 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: Wed, 22 Feb 2006 23:00:34 -0000 >Number: 93729 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/quakeforge: fix data directory (wasn't loading its data) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 22 23:00:28 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005 root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE >Description: * Use NOT_FOR_ARCHS instead of .if + BROKEN. * Remove USE_REINPLACE. * Run LDCONFIG on the right directory (it was previously doing it in the plugin directory, that doesn't need it). * Add pkg-message about sound problems. * Fix DATADIR pointing to the wrong directory (which is created by quake-data and doesn't need to be removed by quakeforge). * Miscelaneous whitespace changes. >How-To-Repeat: >Fix: --- quakeforge.diff begins here --- diff -urNd /usr/ports/games/quakeforge/Makefile quakeforge/Makefile --- /usr/ports/games/quakeforge/Makefile Thu Nov 17 18:58:25 2005 +++ quakeforge/Makefile Wed Feb 22 19:46:32 2006 @@ -18,11 +18,11 @@ MAINTAINER= alejandro@varnet.biz COMMENT= Cleaned up copy of the GPLd Quake 1 source code +NOT_FOR_ARCHS= sparc64 USE_AUTOTOOLS= libtool:15 +USE_BISON= yes USE_BZIP2= yes USE_GMAKE= yes -USE_REINPLACE= yes -USE_BISON= yes WANT_SDL= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -40,23 +40,22 @@ XMMS "Enable XMMS support in clients" off MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1 - INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/quakeforge + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +DATADIR= ${Q1DIR} .include "${.CURDIR}/../quake-data/Makefile.include" .include -.if ${ARCH} == "sparc64" -BROKEN= "Does not compile on sparc64" -.endif - .if defined(WITH_CLIENTS) -USE_XLIB= yes +USE_GL= yes PLIST_SUB+= CLIENTS="" -.if defined(WITH_SDL) || ${HAVE_SDL:Msdl}!="" +.if defined(WITH_SDL) || ${HAVE_SDL:Msdl} != "" USE_SDL= sdl CONFIGURE_ARGS+=--with-sdl=${LOCALBASE} PLIST_SUB+= SDL="" @@ -86,7 +85,7 @@ .else CONFIGURE_ARGS+=--without-clients PLIST_SUB+= CLIENTS="@comment " -.endif # WITH_CLIENTS +.endif # WITH_CLIENTS .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -funroll-loops -fomit-frame-pointer -fno-common \ @@ -112,8 +111,8 @@ .endif .if defined(WITH_STATIC_PLUGINS) -PLIST_SUB+= PLUGINS="@comment " CONFIGURE_ARGS+=--with-static-plugins +PLIST_SUB+= PLUGINS="@comment " .else PLIST_SUB+= PLUGINS="" .endif @@ -131,5 +130,6 @@ ${CP} -R ${WRKSRC}/doc/${d} ${DOCSDIR} . endfor .endif + @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include diff -urNd /usr/ports/games/quakeforge/files/pkg-message.in quakeforge/files/pkg-message.in --- /usr/ports/games/quakeforge/files/pkg-message.in Wed Dec 31 21:00:00 1969 +++ quakeforge/files/pkg-message.in Wed Feb 22 19:51:05 2006 @@ -0,0 +1,16 @@ +============================================================================== + +QuakeForge has been installed. + +If you have sound problems try increasing the sound rate. This can be done +with the variable "snd_rate". Standard values could be 22050 and 44100. + +To do this when calling the program do (for example): + +nq-glx +set snd_speed 44100 + +Alternatively you can put it in the global configuration file (as root): + +echo "set snd_speed 44100" >> %%PREFIX%%/etc/quakeforge.conf + +============================================================================== diff -urNd /usr/ports/games/quakeforge/pkg-plist quakeforge/pkg-plist --- /usr/ports/games/quakeforge/pkg-plist Thu Dec 15 18:03:26 2005 +++ quakeforge/pkg-plist Wed Feb 22 18:52:22 2006 @@ -282,4 +282,3 @@ @dirrm lib/ruamoko @dirrm lib/quakeforge @dirrm %%DATADIR%%/QF -@dirrm %%DATADIR%% --- quakeforge.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: