Date: Thu, 15 Sep 2005 15:09:48 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/86175: [UPDATE] games/quakeforge: minor changes, integrate with "games/quake-data" Message-ID: <1126807788.0@phobos.mars.bsd> Resent-Message-ID: <200509151810.j8FIAGNq053726@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 86175
>Category: ports
>Synopsis: [UPDATE] games/quakeforge: minor changes, integrate with "games/quake-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: Thu Sep 15 18:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
Changes:
* Integrate with "games/quake-data".
* Change PORTNAME to lower-case.
* Add OPTIONS.
* Add LDCONFIG_DIRS.
* Remove SVGA client, pkg-message and patch (it doesn't work, as noted in pkg-message).
>How-To-Repeat:
>Fix:
--- quakeforge.diff begins here ---
diff -urN /usr/ports/games/quakeforge/Makefile quakeforge/Makefile
--- /usr/ports/games/quakeforge/Makefile Wed Jul 27 18:15:50 2005
+++ quakeforge/Makefile Thu Sep 15 15:01:10 2005
@@ -5,201 +5,130 @@
# $FreeBSD: ports/games/quakeforge/Makefile,v 1.51 2005/05/20 14:47:26 pav Exp $
#
-PORTNAME= QuakeForge
+PORTNAME= quakeforge
PORTVERSION= 0.5.5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:qf/} \
- ftp://ftp.idsoftware.com/idstuff/quakeworld/unix/:qw
-MASTER_SITE_SUBDIR= quake/:qf
-DISTNAME= quakeforge-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:qf ${PROGFILE}:qw
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
+MASTER_SITE_SUBDIR= quake/:sf
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf
+DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-.if !defined(NO_WAD)
-MASTER_SITES+= http://www.libsdl.org/projects/quake/data/:wad
-DISTFILES+= ${WADFILE}:wad
-.endif
-.if !defined(NO_SKINS)
-MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/quakeworld/skins/:skins
-DISTFILES+= ${SKINFILES:S/$/:skins/}
-.endif
MAINTAINER= q@galgenberg.net
COMMENT= Cleaned up copy of the GPLd Quake 1 source code
-WADFILE= quakesw-1.0.6.tar.gz
-PROGFILE= qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
-SKINFILES= skinbase.zip qw_skins.zip
-
-USE_LIBTOOL_VER=15
+USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
USE_REINPLACE= yes
-INSTALLS_SHLIB= yes
+USE_BISON= yes
WANT_SDL= yes
-MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN= "Does not compile on sparc64"
-.endif
-
+USE_LIBTOOL_VER=15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
- --with-sharepath=${PREFIX}/share/quakeforge \
+ --with-sharepath=${DATADIR} \
--disable-optimize
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
+OPTIONS= CLIENTS "Build clients" on \
+ OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+ SDL "Build SDL client" off \
+ SERVERS "Build dedicated servers" on \
+ SKYBOXES "Install skyboxes pak" off \
+ STATIC_PLUGINS "Build plugins into executable" off \
+ VORBIS "Enable Ogg Vorbis support in clients" off \
+ XMMS "Enable XMMS support in clients" off
-.if defined(WITH_OPTIMIZED_CFLAGS) && !defined(WITHOUT_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops -fomit-frame-pointer -fno-common \
- -fexpensive-optimizations -fstrict-aliasing
-.if ${ARCH} != "alpha"
-CFLAGS+= -ffast-math
-.endif
-.endif
+MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
-.if ${HAVE_SDL:Msdl}!=""
-WITH_SDL= yes
-.endif
+INSTALLS_SHLIB= yes
+LDCONFIG_DIRS= %%PREFIX%%/lib/quakeforge
-.if exists(${LOCALBASE}/lib/libvga.so.1)
-WITH_SVGALIB= yes
-.endif
+.include "${.CURDIR}/../quake-data/Makefile.include"
-.if exists(${X11BASE}/lib/libxmms.so.4)
-WITH_XMMS= yes
-.endif
+.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libvorbis.so.3)
-WITH_VORBIS= yes
+.if ${ARCH} == "sparc64"
+BROKEN= "Does not compile on sparc64"
.endif
-.if defined(WITHOUT_CLIENTS)
-CONFIGURE_ARGS+=--without-clients
-PLIST_SUB+= CLIENT="@comment "
-WITHOUT_XMMS= yes
-WITHOUT_SVGALIB= yes
-WITHOUT_SDL= yes
-WITHOUT_VORBIS= yes
-.else
-PLIST_SUB+= CLIENT=""
-.endif
+.if defined(WITH_CLIENTS)
+USE_XLIB= yes
+PLIST_SUB+= CLIENTS=""
-.if !defined(WITHOUT_SVGALIB) && defined(WITH_SVGALIB)
-LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
-CONFIGURE_ARGS+=--with-svga=${LOCALBASE}
-PLIST_SUB+= SVGA=""
+.if defined(WITH_SDL) || ${HAVE_SDL:Msdl}!=""
+USE_SDL= sdl
+CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
+PLIST_SUB+= SDL=""
.else
-CONFIGURE_ARGS+=--without-svga
-PLIST_SUB+= SVGA="@comment "
+CONFIGURE_ARGS+=--without-sdl
+PLIST_SUB+= SDL="@comment "
.endif
-.if !defined(WITHOUT_VORBIS) && defined(WITH_VORBIS)
+.if defined(WITH_VORBIS) || exists(${LOCALBASE}/lib/libvorbis.so.3)
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
PLIST_SUB+= VORBIS=""
.else
-CONFIGURE_ARGS+=--disable-vorbis --without-ogg --without-ogg-libraries \
- --without-ogg-includes --disable-oggtest
+CONFIGURE_ARGS+=--without-ogg --without-vorbis
PLIST_SUB+= VORBIS="@comment "
.endif
-.if !defined(WITHOUT_XMMS) && defined(WITH_XMMS)
+.if defined(WITH_XMMS) || exists(${X11BASE}/lib/libxmms.so.4)
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
CONFIGURE_ARGS+=--with-xmms-prefix=${X11BASE}
PLIST_SUB+= XMMS=""
.else
-CONFIGURE_ARGS+=--disable-xmms
+CONFIGURE_ARGS+=--without-xmms
PLIST_SUB+= XMMS="@comment "
.endif
-.if !defined(WITHOUT_SDL) && defined(WITH_SDL)
-USE_SDL= sdl
-CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
-PLIST_SUB+= SDL=""
.else
-CONFIGURE_ARGS+=--disable-sdl --disable-sdltest
-PLIST_SUB+= SDL="@comment "
-.endif
+CONFIGURE_ARGS+=--without-clients
+PLIST_SUB+= CLIENTS="@comment "
+.endif # WITH_CLIENTS
-.if defined(WITH_STATIC_PLUGINS)
-PLIST_SUB+= PLUGIN="@comment "
-CONFIGURE_ARGS+=--with-static-plugins
-.else
-PLIST_SUB+= PLUGIN=""
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+= -O3 -funroll-loops -fomit-frame-pointer -fno-common \
+ -fexpensive-optimizations -fstrict-aliasing
+. if ${ARCH} != "alpha"
+CFLAGS+= -ffast-math
+. endif
.endif
-.if !defined(NO_WAD)
-PLIST_SUB+= WAD=""
+.if defined(WITH_SERVERS)
+PLIST_SUB+= SERVERS=""
.else
-PLIST_SUB+= WAD="@comment "
+CONFIGURE_ARGS+=--without-servers
+PLIST_SUB+= SERVERS="@comment "
.endif
-.if !defined(NO_SKINS)
-PLIST_SUB+= SKIN=""
-BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
+.if defined(WITH_SKYBOXES)
+MASTER_SITES+= http://www.quakeforge.net/files/:qf
+DISTFILES+= skyboxes.pak:qf
+PLIST_SUB+= SKYBOXES=""
.else
-PLIST_SUB+= SKIN="@comment "
+PLIST_SUB+= SKYBOXES="@comment "
.endif
-pre-everything::
-.if !defined(NO_WAD)
- @${ECHO_MSG} "Define NO_WAD to stop from using shareware version!"
-.endif
-.if !defined(NO_SKINS)
- @${ECHO_MSG} "Define NO_SKINS to stop from installing skins"
-.endif
-.if !defined(WITH_OPTIMIZED_CFLAGS)
- @${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to optimize for speed"
-.endif
-.if !defined(WITH_SVGALIB)
- @${ECHO_MSG} "Define WITH_SVGALIB to use svgalib"
-.endif
-.if !defined(WITH_VORBIS)
- @${ECHO_MSG} "Define WITH_VORBIS to use Ogg Vorbis"
-.endif
-.if !defined(WITH_XMMS)
- @${ECHO_MSG} "Define WITH_XMMS to use XMMS"
-.endif
-.if !defined(WITH_SDL)
- @${ECHO_MSG} "Define WITH_SDL to use SDL"
-.endif
-.if !defined(WITHOUT_CLIENTS)
- @${ECHO_MSG} "Define WITHOUT_CLIENTS to disable building of the clients"
-.endif
-.if !defined(WITH_STATIC_PLUGINS)
- @${ECHO_MSG} "Define WITH_STATIC_PLUGINS to disable building plugins as shared objects"
+.if defined(WITH_STATIC_PLUGINS)
+PLIST_SUB+= PLUGINS="@comment "
+CONFIGURE_ARGS+=--with-static-plugins
+.else
+PLIST_SUB+= PLUGINS=""
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
-
-do-install:
- @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.if !defined(NO_WAD)
- ${MKDIR} ${PREFIX}/share/quakeforge/id1 && \
- ${TAR} xzf ${DISTDIR}/${WADFILE} -C ${PREFIX}/share/quakeforge --no-same-owner id1/pak0.pak
-.endif
- ${TAR} xzf ${DISTDIR}/${PROGFILE} -C ${PREFIX}/share/quakeforge qw/
-.if !defined(NO_SKINS)
-.for file in ${SKINFILES}
- ${UNZIP_CMD} -n ${DISTDIR}/${file} -d ${PREFIX}/share/quakeforge/qw/skins
-.endfor
- @cd ${PREFIX}/share/quakeforge/qw/skins && LANG=C ./fixskins.sh *
+post-install:
+.if defined(WITH_SKYBOXES)
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skyboxes.pak ${DATADIR}/QF
.endif
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}/config ${DOCSDIR}/data/docs ${DOCSDIR}/ideas
- cd ${WRKSRC}/doc && \
- ${INSTALL_MAN} *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle ${DOCSDIR} && \
- ${INSTALL_MAN} config/*.cfg ${DOCSDIR}/config && \
- ${INSTALL_MAN} data/*.txt ${DOCSDIR}/data && \
- ${INSTALL_MAN} data/docs/* ${DOCSDIR}/data/docs && \
- ${INSTALL_MAN} ideas/*.txt ${DOCSDIR}/ideas
+ ${MKDIR} ${DOCSDIR}
+. for f in *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+. endfor
+. for d in config data ideas
+ ${CP} -R ${WRKSRC}/doc/${d} ${DOCSDIR}
+. endfor
.endif
-
-post-install:
- @${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -urN /usr/ports/games/quakeforge/distinfo quakeforge/distinfo
--- /usr/ports/games/quakeforge/distinfo Fri Aug 20 16:50:54 2004
+++ quakeforge/distinfo Wed Sep 14 20:42:53 2005
@@ -1,10 +1,4 @@
-MD5 (quakeforge-0.5.5.tar.gz) = 5e8059546ed8797245bf9ba6a62b3fb3
-SIZE (quakeforge-0.5.5.tar.gz) = 2659432
-MD5 (qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz) = 75333c66edd156a1695452d3971169d7
-SIZE (qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz) = 205578
-MD5 (quakesw-1.0.6.tar.gz) = 663b749612d55de29f74966ec3168918
-SIZE (quakesw-1.0.6.tar.gz) = 8583554
-MD5 (skinbase.zip) = 12f3956955c25aa0d508a4d10e7e0532
-SIZE (skinbase.zip) = 18284
-MD5 (qw_skins.zip) = b82f6246276f6013835fab2e76455c65
-SIZE (qw_skins.zip) = 1466694
+MD5 (quakeforge/quakeforge-0.5.5.tar.bz2) = b750b491ce24135f1a4a1360029de3a2
+SIZE (quakeforge/quakeforge-0.5.5.tar.bz2) = 1954072
+MD5 (quakeforge/skyboxes.pak) = 2c52341193b73a0b3c213ab42f777a5f
+SIZE (quakeforge/skyboxes.pak) = 1934684
diff -urN /usr/ports/games/quakeforge/files/patch-libs::video::targets::vid_svgalib.c quakeforge/files/patch-libs::video::targets::vid_svgalib.c
--- /usr/ports/games/quakeforge/files/patch-libs::video::targets::vid_svgalib.c Fri Aug 20 16:50:54 2004
+++ quakeforge/files/patch-libs::video::targets::vid_svgalib.c Wed Dec 31 21:00:00 1969
@@ -1,39 +0,0 @@
---- libs/video/targets/vid_svgalib.c.orig Fri Aug 20 10:51:02 2004
-+++ libs/video/targets/vid_svgalib.c Fri Aug 20 10:52:52 2004
-@@ -82,6 +82,19 @@
- byte *VGA_pagebase;
- int VID_options_items = 0;
-
-+#if defined(i386) && defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
-+void
-+outb (unsigned char val, unsigned short port)
-+{
-+ asm ("outb %b0, %w1" : :"a"(val), "d"(port));
-+}
-+#elif defined(__FreeBSD__)
-+static inline void
-+outb (unsigned char value, unsigned short port)
-+{
-+ __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "d" (port));
-+}
-+#endif
-
- void
- D_BeginDirectRect (int x, int y, byte * pbitmap, int width, int height)
-@@ -487,16 +500,3 @@
- return false;
- }
-
--#if defined(i386) && defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
--void
--outb (unsigned char val, unsigned short port)
--{
-- asm ("outb %b0, %w1" : :"a"(val), "d"(port));
--}
--#elif defined(__FreeBSD__)
--static inline void
--outb (unsigned char value, unsigned short port)
--{
-- __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "d" (port));
--}
--#endif
diff -urN /usr/ports/games/quakeforge/pkg-message quakeforge/pkg-message
--- /usr/ports/games/quakeforge/pkg-message Sat Feb 1 09:51:47 2003
+++ quakeforge/pkg-message Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
-===============================================
-
-Install models, skins, maps and mods in
-${PREFIX}/share/quakeforge
-
-ATTENTION: Don't run the -svga clients, they
-will probably render your keyboard/video/mouse,
-unusable, forcing you to kill the client via
-telnet/ssh/serial console.
-
-===============================================
diff -urN /usr/ports/games/quakeforge/pkg-plist quakeforge/pkg-plist
--- /usr/ports/games/quakeforge/pkg-plist Wed Jul 27 18:15:50 2005
+++ quakeforge/pkg-plist Wed Sep 14 21:15:33 2005
@@ -1,13 +1,11 @@
bin/bsp2img
-bin/hw-master
-%%CLIENT%%%%SVGA%%bin/nq-3dfx
-%%CLIENT%%bin/nq-glx
-%%CLIENT%%%%SDL%%bin/nq-sdl
-%%CLIENT%%%%SDL%%bin/nq-sdl32
-bin/nq-server
-%%CLIENT%%%%SDL%%bin/nq-sgl
-%%CLIENT%%%%SVGA%%bin/nq-svga
-%%CLIENT%%bin/nq-x11
+%%SERVERS%%bin/hw-master
+%%CLIENTS%%bin/nq-glx
+%%CLIENTS%%%%SDL%%bin/nq-sdl
+%%CLIENTS%%%%SDL%%bin/nq-sdl32
+%%SERVERS%%bin/nq-server
+%%CLIENTS%%%%SDL%%bin/nq-sgl
+%%CLIENTS%%bin/nq-x11
bin/pak
bin/qfbsp
bin/qfcc
@@ -17,21 +15,19 @@
bin/qfprogs
bin/qfvis
bin/qfwavinfo
-bin/qtv
-%%CLIENT%%%%SVGA%%bin/qw-client-3dfx
-%%CLIENT%%bin/qw-client-glx
-%%CLIENT%%%%SDL%%bin/qw-client-sdl
-%%CLIENT%%%%SDL%%bin/qw-client-sdl32
-%%CLIENT%%%%SDL%%bin/qw-client-sgl
-%%CLIENT%%%%SVGA%%bin/qw-client-svga
-%%CLIENT%%bin/qw-client-x11
-bin/qw-master
-bin/qw-server
+%%SERVERS%%bin/qtv
+%%CLIENTS%%bin/qw-client-glx
+%%CLIENTS%%%%SDL%%bin/qw-client-sdl
+%%CLIENTS%%%%SDL%%bin/qw-client-sdl32
+%%CLIENTS%%%%SDL%%bin/qw-client-sgl
+%%CLIENTS%%bin/qw-client-x11
+%%SERVERS%%bin/qw-master
+%%SERVERS%%bin/qw-server
bin/wad
bin/zpak
-%%CLIENT%%lib/libQFcd.a
-%%CLIENT%%lib/libQFcd.so
-%%CLIENT%%lib/libQFcd.so.1
+%%CLIENTS%%lib/libQFcd.a
+%%CLIENTS%%lib/libQFcd.so
+%%CLIENTS%%lib/libQFcd.so.1
lib/libQFconsole.a
lib/libQFconsole.so
lib/libQFconsole.so.1
@@ -47,247 +43,49 @@
lib/libQFimage.a
lib/libQFimage.so
lib/libQFimage.so.1
-%%CLIENT%%lib/libQFjs.a
-%%CLIENT%%lib/libQFjs.so
-%%CLIENT%%lib/libQFjs.so.1
+%%CLIENTS%%lib/libQFjs.a
+%%CLIENTS%%lib/libQFjs.so
+%%CLIENTS%%lib/libQFjs.so.1
lib/libQFmodels.a
lib/libQFmodels.so
lib/libQFmodels.so.1
-%%CLIENT%%lib/libQFmodels_gl.a
-%%CLIENT%%lib/libQFmodels_gl.so
-%%CLIENT%%lib/libQFmodels_gl.so.1
-%%CLIENT%%lib/libQFmodels_sw.a
-%%CLIENT%%lib/libQFmodels_sw.so
-%%CLIENT%%lib/libQFmodels_sw.so.1
-%%CLIENT%%lib/libQFrenderer_gl.a
-%%CLIENT%%lib/libQFrenderer_gl.so
-%%CLIENT%%lib/libQFrenderer_gl.so.1
-%%CLIENT%%%%SDL%%lib/libQFrenderer_sw32.a
-%%CLIENT%%%%SDL%%lib/libQFrenderer_sw32.so
-%%CLIENT%%%%SDL%%lib/libQFrenderer_sw32.so.1
+%%CLIENTS%%lib/libQFmodels_gl.a
+%%CLIENTS%%lib/libQFmodels_gl.so
+%%CLIENTS%%lib/libQFmodels_gl.so.1
+%%CLIENTS%%lib/libQFmodels_sw.a
+%%CLIENTS%%lib/libQFmodels_sw.so
+%%CLIENTS%%lib/libQFmodels_sw.so.1
+%%CLIENTS%%lib/libQFrenderer_gl.a
+%%CLIENTS%%lib/libQFrenderer_gl.so
+%%CLIENTS%%lib/libQFrenderer_gl.so.1
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.a
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so
+%%CLIENTS%%%%SDL%%lib/libQFrenderer_sw32.so.1
lib/libQFruamoko.a
lib/libQFruamoko.so
lib/libQFruamoko.so.1
-%%CLIENT%%lib/libQFsound.a
-%%CLIENT%%lib/libQFsound.so
-%%CLIENT%%lib/libQFsound.so.1
+%%CLIENTS%%lib/libQFsound.a
+%%CLIENTS%%lib/libQFsound.so
+%%CLIENTS%%lib/libQFsound.so.1
lib/libQFutil.a
lib/libQFutil.so
lib/libQFutil.so.1
-%%PLUGIN%%%%CLIENT%%lib/quakeforge/cd_file.so
-%%PLUGIN%%%%CLIENT%%%%SDL%%lib/quakeforge/cd_sdl.so
-%%PLUGIN%%%%CLIENT%%%%XMMS%%lib/quakeforge/cd_xmms.so
-%%PLUGIN%%lib/quakeforge/console_client.so
-%%PLUGIN%%lib/quakeforge/console_server.so
-%%PLUGIN%%%%CLIENT%%lib/quakeforge/snd_output_disk.so
-%%PLUGIN%%%%CLIENT%%lib/quakeforge/snd_output_oss.so
-%%PLUGIN%%%%CLIENT%%%%SDL%%lib/quakeforge/snd_output_sdl.so
-%%PLUGIN%%%%CLIENT%%lib/quakeforge/snd_render_default.so
+%%PLUGINS%%%%CLIENTS%%lib/quakeforge/cd_file.so
+%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/cd_sdl.so
+%%PLUGINS%%%%CLIENTS%%%%XMMS%%lib/quakeforge/cd_xmms.so
+%%PLUGINS%%lib/quakeforge/console_client.so
+%%PLUGINS%%lib/quakeforge/console_server.so
+%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_disk.so
+%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_output_oss.so
+%%PLUGINS%%%%CLIENTS%%%%SDL%%lib/quakeforge/snd_output_sdl.so
+%%PLUGINS%%%%CLIENTS%%lib/quakeforge/snd_render_default.so
lib/ruamoko/libcsqc.a
lib/ruamoko/libgui.a
lib/ruamoko/libnq.a
lib/ruamoko/libqw.a
lib/ruamoko/libr.a
-share/quakeforge/QF/menu.dat.gz
-%%WAD%%share/quakeforge/id1/pak0.pak
-share/quakeforge/qw/buttons.qc
-share/quakeforge/qw/client.qc
-share/quakeforge/qw/combat.qc
-share/quakeforge/qw/defs.qc
-share/quakeforge/qw/doors.qc
-share/quakeforge/qw/items.qc
-share/quakeforge/qw/misc.qc
-share/quakeforge/qw/models.qc
-share/quakeforge/qw/plats.qc
-share/quakeforge/qw/player.qc
-share/quakeforge/qw/progdefs.h
-share/quakeforge/qw/progs.src
-share/quakeforge/qw/qwprogs.dat
-share/quakeforge/qw/server.qc
-share/quakeforge/qw/spectate.qc
-share/quakeforge/qw/sprites.qc
-share/quakeforge/qw/subs.qc
-share/quakeforge/qw/triggers.qc
-share/quakeforge/qw/weapons.qc
-share/quakeforge/qw/world.qc
-share/quakeforge/qw/skins/fixskins.sh
-%%SKIN%%share/quakeforge/qw/skins/311.pcx
-%%SKIN%%share/quakeforge/qw/skins/311.txt
-%%SKIN%%share/quakeforge/qw/skins/amish.pcx
-%%SKIN%%share/quakeforge/qw/skins/ammoskin.pcx
-%%SKIN%%share/quakeforge/qw/skins/antimatr.pcx
-%%SKIN%%share/quakeforge/qw/skins/antimatr.txt
-%%SKIN%%share/quakeforge/qw/skins/archonsm.pcx
-%%SKIN%%share/quakeforge/qw/skins/archonsm.txt
-%%SKIN%%share/quakeforge/qw/skins/axis.pcx
-%%SKIN%%share/quakeforge/qw/skins/base.pcx
-%%SKIN%%share/quakeforge/qw/skins/base.txt
-%%SKIN%%share/quakeforge/qw/skins/bblades.pcx
-%%SKIN%%share/quakeforge/qw/skins/bblades.txt
-%%SKIN%%share/quakeforge/qw/skins/bearian.pcx
-%%SKIN%%share/quakeforge/qw/skins/bearian.txt
-%%SKIN%%share/quakeforge/qw/skins/bioforce.pcx
-%%SKIN%%share/quakeforge/qw/skins/bioforce.txt
-%%SKIN%%share/quakeforge/qw/skins/blacklor.pcx
-%%SKIN%%share/quakeforge/qw/skins/blacklor.txt
-%%SKIN%%share/quakeforge/qw/skins/boc-skin.pcx
-%%SKIN%%share/quakeforge/qw/skins/boc-skin.txt
-%%SKIN%%share/quakeforge/qw/skins/borg.pcx
-%%SKIN%%share/quakeforge/qw/skins/borg.txt
-%%SKIN%%share/quakeforge/qw/skins/campq.pcx
-%%SKIN%%share/quakeforge/qw/skins/campq.txt
-%%SKIN%%share/quakeforge/qw/skins/caveman.pcx
-%%SKIN%%share/quakeforge/qw/skins/caveman.txt
-%%SKIN%%share/quakeforge/qw/skins/clanborg.pcx
-%%SKIN%%share/quakeforge/qw/skins/clanborg.txt
-%%SKIN%%share/quakeforge/qw/skins/cnaetoph.pcx
-%%SKIN%%share/quakeforge/qw/skins/cnaetoph.txt
-%%SKIN%%share/quakeforge/qw/skins/corporat.pcx
-%%SKIN%%share/quakeforge/qw/skins/corporat.txt
-%%SKIN%%share/quakeforge/qw/skins/cronus.pcx
-%%SKIN%%share/quakeforge/qw/skins/cronus.txt
-%%SKIN%%share/quakeforge/qw/skins/cthulhu1.pcx
-%%SKIN%%share/quakeforge/qw/skins/cthulhu1.txt
-%%SKIN%%share/quakeforge/qw/skins/dcskin.pcx
-%%SKIN%%share/quakeforge/qw/skins/deathsqu.pcx
-%%SKIN%%share/quakeforge/qw/skins/deathsqu.txt
-%%SKIN%%share/quakeforge/qw/skins/defender.pcx
-%%SKIN%%share/quakeforge/qw/skins/defender.txt
-%%SKIN%%share/quakeforge/qw/skins/demonicc.pcx
-%%SKIN%%share/quakeforge/qw/skins/devilsad.pcx
-%%SKIN%%share/quakeforge/qw/skins/devilsad.txt
-%%SKIN%%share/quakeforge/qw/skins/discordi.pcx
-%%SKIN%%share/quakeforge/qw/skins/discordi.txt
-%%SKIN%%share/quakeforge/qw/skins/empyrean.pcx
-%%SKIN%%share/quakeforge/qw/skins/entropy.pcx
-%%SKIN%%share/quakeforge/qw/skins/entropy.txt
-%%SKIN%%share/quakeforge/qw/skins/evilclow.pcx
-%%SKIN%%share/quakeforge/qw/skins/evilclow.txt
-%%SKIN%%share/quakeforge/qw/skins/evilempi.pcx
-%%SKIN%%share/quakeforge/qw/skins/evilempi.txt
-%%SKIN%%share/quakeforge/qw/skins/fbi.pcx
-%%SKIN%%share/quakeforge/qw/skins/fbi.txt
-%%SKIN%%share/quakeforge/qw/skins/fruits.pcx
-%%SKIN%%share/quakeforge/qw/skins/gibmoon.pcx
-%%SKIN%%share/quakeforge/qw/skins/gibmoon.txt
-%%SKIN%%share/quakeforge/qw/skins/glodskin.pcx
-%%SKIN%%share/quakeforge/qw/skins/glodskin.txt
-%%SKIN%%share/quakeforge/qw/skins/goodfell.pcx
-%%SKIN%%share/quakeforge/qw/skins/goodfell.txt
-%%SKIN%%share/quakeforge/qw/skins/grendel.pcx
-%%SKIN%%share/quakeforge/qw/skins/grendel.txt
-%%SKIN%%share/quakeforge/qw/skins/heavensd.pcx
-%%SKIN%%share/quakeforge/qw/skins/hiwaay.pcx
-%%SKIN%%share/quakeforge/qw/skins/hiwaay.txt
-%%SKIN%%share/quakeforge/qw/skins/hiwaayme.pcx
-%%SKIN%%share/quakeforge/qw/skins/hiwaayme.txt
-%%SKIN%%share/quakeforge/qw/skins/imperial.pcx
-%%SKIN%%share/quakeforge/qw/skins/imperial.txt
-%%SKIN%%share/quakeforge/qw/skins/impulse9.pcx
-%%SKIN%%share/quakeforge/qw/skins/impulse9.txt
-%%SKIN%%share/quakeforge/qw/skins/inferno.pcx
-%%SKIN%%share/quakeforge/qw/skins/inpraise.pcx
-%%SKIN%%share/quakeforge/qw/skins/inpraise.txt
-%%SKIN%%share/quakeforge/qw/skins/jiba.pcx
-%%SKIN%%share/quakeforge/qw/skins/jiba.txt
-%%SKIN%%share/quakeforge/qw/skins/jump.pcx
-%%SKIN%%share/quakeforge/qw/skins/jump.txt
-%%SKIN%%share/quakeforge/qw/skins/knightso.pcx
-%%SKIN%%share/quakeforge/qw/skins/knightso.txt
-%%SKIN%%share/quakeforge/qw/skins/knightst.pcx
-%%SKIN%%share/quakeforge/qw/skins/knightst.txt
-%%SKIN%%share/quakeforge/qw/skins/mario.pcx
-%%SKIN%%share/quakeforge/qw/skins/misfits.pcx
-%%SKIN%%share/quakeforge/qw/skins/misfits.txt
-%%SKIN%%share/quakeforge/qw/skins/mod.pcx
-%%SKIN%%share/quakeforge/qw/skins/mynx.pcx
-%%SKIN%%share/quakeforge/qw/skins/newskin.pcx
-%%SKIN%%share/quakeforge/qw/skins/nimbus.pcx
-%%SKIN%%share/quakeforge/qw/skins/nimbus.txt
-%%SKIN%%share/quakeforge/qw/skins/nwtc.pcx
-%%SKIN%%share/quakeforge/qw/skins/nwtc.txt
-%%SKIN%%share/quakeforge/qw/skins/omega7.pcx
-%%SKIN%%share/quakeforge/qw/skins/omega7.txt
-%%SKIN%%share/quakeforge/qw/skins/original.pcx
-%%SKIN%%share/quakeforge/qw/skins/original.txt
-%%SKIN%%share/quakeforge/qw/skins/outlaws.pcx
-%%SKIN%%share/quakeforge/qw/skins/outlaws.txt
-%%SKIN%%share/quakeforge/qw/skins/p2k.pcx
-%%SKIN%%share/quakeforge/qw/skins/painland.pcx
-%%SKIN%%share/quakeforge/qw/skins/painland.txt
-%%SKIN%%share/quakeforge/qw/skins/pantdown.pcx
-%%SKIN%%share/quakeforge/qw/skins/pantdown.txt
-%%SKIN%%share/quakeforge/qw/skins/pgwn.pcx
-%%SKIN%%share/quakeforge/qw/skins/pgwn.txt
-%%SKIN%%share/quakeforge/qw/skins/quakenp.pcx
-%%SKIN%%share/quakeforge/qw/skins/quakenp.txt
-%%SKIN%%share/quakeforge/qw/skins/quakerst.pcx
-%%SKIN%%share/quakeforge/qw/skins/quakerst.txt
-%%SKIN%%share/quakeforge/qw/skins/quasar.pcx
-%%SKIN%%share/quakeforge/qw/skins/quasar.txt
-%%SKIN%%share/quakeforge/qw/skins/quest.pcx
-%%SKIN%%share/quakeforge/qw/skins/quest.txt
-%%SKIN%%share/quakeforge/qw/skins/rampire.pcx
-%%SKIN%%share/quakeforge/qw/skins/rampire.txt
-%%SKIN%%share/quakeforge/qw/skins/rdcrap8.pcx
-%%SKIN%%share/quakeforge/qw/skins/reservoi.pcx
-%%SKIN%%share/quakeforge/qw/skins/reservoi.txt
-%%SKIN%%share/quakeforge/qw/skins/revco.pcx
-%%SKIN%%share/quakeforge/qw/skins/revco.txt
-%%SKIN%%share/quakeforge/qw/skins/rlg.pcx
-%%SKIN%%share/quakeforge/qw/skins/rlg.txt
-%%SKIN%%share/quakeforge/qw/skins/rock.pcx
-%%SKIN%%share/quakeforge/qw/skins/rock.txt
-%%SKIN%%share/quakeforge/qw/skins/ruthless.pcx
-%%SKIN%%share/quakeforge/qw/skins/ruthless.txt
-%%SKIN%%share/quakeforge/qw/skins/sacredparadox.pcx
-%%SKIN%%share/quakeforge/qw/skins/sg5skin.pcx
-%%SKIN%%share/quakeforge/qw/skins/shad.pcx
-%%SKIN%%share/quakeforge/qw/skins/shadows.pcx
-%%SKIN%%share/quakeforge/qw/skins/shadows.txt
-%%SKIN%%share/quakeforge/qw/skins/shunters.pcx
-%%SKIN%%share/quakeforge/qw/skins/shunters.txt
-%%SKIN%%share/quakeforge/qw/skins/skins.txt
-%%SKIN%%share/quakeforge/qw/skins/sonsofsa.pcx
-%%SKIN%%share/quakeforge/qw/skins/sonsofsa.txt
-%%SKIN%%share/quakeforge/qw/skins/sos.pcx
-%%SKIN%%share/quakeforge/qw/skins/sos.txt
-%%SKIN%%share/quakeforge/qw/skins/spawncla.pcx
-%%SKIN%%share/quakeforge/qw/skins/stomped.pcx
-%%SKIN%%share/quakeforge/qw/skins/stomped.txt
-%%SKIN%%share/quakeforge/qw/skins/stoned.pcx
-%%SKIN%%share/quakeforge/qw/skins/stoned.txt
-%%SKIN%%share/quakeforge/qw/skins/strikefo.pcx
-%%SKIN%%share/quakeforge/qw/skins/strikefo.txt
-%%SKIN%%share/quakeforge/qw/skins/subgeniu.pcx
-%%SKIN%%share/quakeforge/qw/skins/subgeniu.txt
-%%SKIN%%share/quakeforge/qw/skins/surfin.pcx
-%%SKIN%%share/quakeforge/qw/skins/surfin.txt
-%%SKIN%%share/quakeforge/qw/skins/syn.pcx
-%%SKIN%%share/quakeforge/qw/skins/syn.txt
-%%SKIN%%share/quakeforge/qw/skins/tards.pcx
-%%SKIN%%share/quakeforge/qw/skins/tards.txt
-%%SKIN%%share/quakeforge/qw/skins/tid.pcx
-%%SKIN%%share/quakeforge/qw/skins/tid.txt
-%%SKIN%%share/quakeforge/qw/skins/tokay.pcx
-%%SKIN%%share/quakeforge/qw/skins/tokay.txt
-%%SKIN%%share/quakeforge/qw/skins/trilogy.pcx
-%%SKIN%%share/quakeforge/qw/skins/trilogy.txt
-%%SKIN%%share/quakeforge/qw/skins/ua_skin.pcx
-%%SKIN%%share/quakeforge/qw/skins/ua_skin.txt
-%%SKIN%%share/quakeforge/qw/skins/undeadel.pcx
-%%SKIN%%share/quakeforge/qw/skins/undeadel.txt
-%%SKIN%%share/quakeforge/qw/skins/undergro.pcx
-%%SKIN%%share/quakeforge/qw/skins/undergro.txt
-%%SKIN%%share/quakeforge/qw/skins/uninet.pcx
-%%SKIN%%share/quakeforge/qw/skins/vermin.pcx
-%%SKIN%%share/quakeforge/qw/skins/vermin.txt
-%%SKIN%%share/quakeforge/qw/skins/w5.pcx
-%%SKIN%%share/quakeforge/qw/skins/w5.txt
-%%SKIN%%share/quakeforge/qw/skins/watchmen.pcx
-%%SKIN%%share/quakeforge/qw/skins/watchmen.txt
-%%SKIN%%share/quakeforge/qw/skins/wolfpak.pcx
-%%SKIN%%share/quakeforge/qw/skins/wolfpak.txt
+%%DATADIR%%/QF/menu.dat.gz
+%%SKYBOXES%%%%DATADIR%%/QF/skyboxes.pak
include/QF/bspfile.h
include/QF/cbuf.h
include/QF/cdaudio.h
@@ -444,6 +242,12 @@
%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v1.cfg
%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v3.cfg
%%PORTDOCS%%%%DOCSDIR%%/config/swspeed.cfg
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/adjustvolume.gib
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/infobot.gib
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/ln.gib
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/qfadmin.gib
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/sshot.gib
+%%PORTDOCS%%%%DOCSDIR%%/config/gib/zoom.gib
%%PORTDOCS%%%%DOCSDIR%%/data/comexp.txt
%%PORTDOCS%%%%DOCSDIR%%/data/help.txt
%%PORTDOCS%%%%DOCSDIR%%/data/licinfo.txt
@@ -465,6 +269,7 @@
%%PORTDOCS%%%%DOCSDIR%%/ideas/rhamph.txt
%%PORTDOCS%%%%DOCSDIR%%/ideas/serverlist.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ideas
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/config/gib
%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
%%PORTDOCS%%@dirrm %%DOCSDIR%%/data/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%/data
@@ -476,9 +281,4 @@
@dirrm include/QF
@dirrm lib/ruamoko
@dirrm lib/quakeforge
-@unexec rmdir %D/share/quakeforge/QF/ 2>/dev/null || true
-@unexec rmdir %D/share/quakeforge/id1/ 2>/dev/null || true
-@unexec rmdir %D/share/quakeforge/qw/skins/ 2>/dev/null || true
-@unexec rmdir %D/share/quakeforge/qw/ 2>/dev/null || true
-@unexec rmdir %D/share/quakeforge/ 2>/dev/null || true
-@unexec rmdir %D/share/ 2>/dev/null || true
+@dirrm %%DATADIR%%/QF
--- quakeforge.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1126807788.0>