Hi,
here's an update to get Quakeforge updated to a ~11 years newer code base.
Some major changes include:
- Working sound via SDL
- Binaries renamed (see pkg_info -L)
- Data directory handled better (see DESCR)
- Common -libs package for -main and -server
- GGI renderer got removed, renderers now available:
glx, sdl, sdl32 (32b bit depth) and sgl (SDL GL) and x11
- Lots of patches removed and all of the generic new ones have been fed to
upstream
- All binaries can be compiled at once now, so this should reduce build times a
little
I'm hosting the distfile until upstream rolls a proper release.
I also added myself as maintainer. Tested on i386 and amd64.
Some minor bugs exist, but I think it's worth updating the port
so other people can work on this too instead of putting their effort
into a lost cause with the in-tree version.
Thanks to Jacob Meuser and Alexandre Ratchov for their help with the audio
stuff.
So many things here, I hope I didn't forgot any, at least the games/Makefile
will need to
be adjusted like below. Are the vanishing FLAVORS handled correctly?
--
Antti Harri
diff --git games/Makefile games/Makefile
index 32354a8..960b95d 100644
--- games/Makefile
+++ games/Makefile
@@ -131,7 +131,6 @@
SUBDIR += qgo
SUBDIR += qstat
SUBDIR += quake
- SUBDIR += quake,gl
SUBDIR += quake2
SUBDIR += rftg
SUBDIR += ri-li
diff --git games/quake/Makefile games/quake/Makefile
index f491713..d0be848 100644
--- games/quake/Makefile
+++ games/quake/Makefile
@@ -1,83 +1,123 @@
# $OpenBSD: ports/games/quake/Makefile,v 1.34 2011/06/10 19:49:11 naddy Exp $
-COMMENT-main= Quake/Quake-world client
-COMMENT-server= Quake world server
-CATEGORIES= games
-
-FULLPKGNAME-server= quakeworld-server-20000101
+SHARED_ONLY = Yes
+
+COMMENT-main = Quake/QuakeWorld client
+COMMENT-libs = Quake common libs
+COMMENT-server = QuakeWorld server
+
+# .so.1.0
+SOMAJOR = 0
+SOMINOR = 0
+V = 20110621
+DISTNAME = quakeforge-$V
+PKGNAME-main = quake-$V
+PKGNAME-libs = quake-libs-$V
+FULLPKGNAME-server= quakeworld-server-$V
FULLPKGPATH-server= games/quake,-server
EPOCH-server= 0
-PKGNAME-main= quake-20000101
-REVISION-main= 10
+MULTI_PACKAGES= -main -libs -server
+
+SHARED_LIBS += QFcd ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFconsole ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFgamecode ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFgib ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFimage ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFjs ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels_gl ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels_sw ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFrenderer_gl ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFrenderer_sw32 ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFruamoko ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFsound ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFutil ${SOMAJOR}.${SOMINOR}
-DISTNAME= quake-v6-bsd-kame
-PATCHFILES= quake6-00-v6-20000202b.diff.gz:0
-PATCH_DIST_STRIP= -p1
+CATEGORIES = games x11
-HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml
-MASTER_SITES= ${MASTER_SITE_BACKUP}
-MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
+HOMEPAGE = http://www.quakeforge.net/
+
+MAINTAINER = Antti Harri <i...@openbsd.fi>
# GPLv2
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-
-WANTLIB= c m
-
-USE_GMAKE= Yes
-
-MULTI_PACKAGES= -main -server
-FLAVORS= sdl ggi x11 gl
-FLAVOR?= sdl
-
-CONFIGURE_ENV=LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
-CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
-CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS = --bindir=/bin \
- --with-opengl=no --with-opengl-includes=no
-
-WANTLIB-main= ${WANTLIB} sndio
-.if ${FLAVOR:L} == sdl
-WANTLIB+= pthread
-LIB_DEPENDS-main= devel/sdl
-WANTLIB-main += SDL
-CONFIGURE_ARGS+= --with-sdl=${LOCALBASE} --without-ggi
-MAKE_FLAGS= HAS_X11=no
-CFLAGS+= -pthread
-.elif ${FLAVOR:L} == ggi
-WANTLIB+= pthread
-LIB_DEPENDS-main= graphics/ggi
-WANTLIB-main += ggi
-CONFIGURE_ARGS+= --with-ggi=${LOCALBASE} --without-sdl
-MAKE_FLAGS= HAS_X11=no
-CFLAGS+= -pthread
-.elif ${FLAVOR:L} == x11
-CONFIGURE_ARGS+= --without-sdl --without-ggi
-MAKE_FLAGS=
-WANTLIB-main= X11 Xext c m sndio
-.elif ${FLAVOR:L} == gl
-CONFIGURE_ARGS+= --with-opengl=yes \
- --with-opengl-includes=${X11BASE}/include \
- --without-ggi
-WANTLIB-main+= GL X11 Xext pthread
-.else
-ERRORS+= choose either sdl, ggi, gl or x11
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB-main = c m ncurses z X11 Xau Xdmcp Xext Xxf86dga Xxf86vm
crypto \
+ iconv pthread pthread-stubs ssl usbhid xcb \
+ SDL curl idn intl png QFcd QFconsole QFgamecode QFgib \
+ QFjs QFimage QFmodels_gl QFmodels_sw QFrenderer_gl \
+ QFrenderer_sw32 QFruamoko QFsound QFutil sndio
+WANTLIB-libs = m ncurses usbhid z iconv SDL png FLAC ogg \
+ vorbis vorbisfile samplerate sndio
+WANTLIB-server = c m ncurses z QFconsole QFgamecode QFgib QFmodels
QFruamoko QFutil \
+ QFimage png pthread
+
+MASTER_SITES = http://openbsd.fi/dist/
+
+MODULES = devel/gettext
+BUILD_DEPENDS = devel/bison \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ ${MODGNU_AUTOCONF_DEPENDS}
+LIB_DEPENDS-server = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs
+LIB_DEPENDS-main = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs \
+ devel/sdl \
+ net/curl \
+ graphics/png \
+ audio/flac
+LIB_DEPENDS-libs = devel/sdl \
+ graphics/png \
+ audio/flac \
+ audio/libvorbis \
+ audio/libsamplerate
+
+USE_GMAKE = Yes
+USE_LIBTOOL = gnu
+
+CONFIGURE_ARGS += --with-clients=glx,sdl,sdl32,sgl,x11 \
+ --with-ipv6 \
+ --with-gl-driver=libGL.so \
+ --with-cd-default=SDL \
+ --with-sharepath=${PREFIX}/share/quakeforge \
+ --disable-static \
+ --disable-oss \
+ --disable-sun \
+ --disable-jack \
+ --with-libFLAC-libraries=${PREFIX}/lib \
+ --with-libFLAC-includes=${PREFIX}/include/FLAC
+CONFIGURE_ENV = LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
+ CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \
+ YACC="bison -y"
+CONFIGURE_STYLE = gnu
+# Quakeforge should automatically detect support for assembler
+# optimizations on i386, however it's currently not linking
+# correctly so disable until a fix exists.
+.if ${MACHINE_ARCH:Mi386}
+CONFIGURE_ARGS += --disable-asmopt
.endif
-WRKDIST= ${WRKDIR}/quakeforge
+AUTOCONF_VERSION = 2.62
+AUTOMAKE_VERSION = 1.11
+
+NO_REGRESS = Yes
-post-extract:
- @rm ${WRKDIST}/{config.cache,config.log}
- @find ${WRKDIST} -name \*.o |xargs rm
- @cp ${FILESDIR}/snd_sndio.c ${WRKDIST}/common
+CFLAGS += -pthread
-post-patch:
- cd ${WRKDIST}; PATH=${PORTPATH} AUTOCONF_VERSION="${AUTOCONF_VERSION}"
autoreconf
+pre-configure:
+ for i in `find "${WRKSRC}" -name Makefile.am | \
+ xargs fgrep version-info | \
+ cut -f 1 -d ':' | \
+ sort -u`; \
+ do perl -pi -e 's/-version-info
[0-9]+:[0-9]+:[0-9]+/-version-number ${SOMAJOR}:${SOMINOR}/' "$$i"; done
+ cd ${WRKSRC}; \
+ AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
+ AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
+ autoreconf -fi
post-install:
- @chown -R ${BINOWN}:${BINGRP} ${PREFIX}/bin/*
+ find "${PREFIX}/lib" \( -name "*.a" -o -name "*.la" \) -print0 | xargs
-0r rm -f
.include <bsd.port.mk>
diff --git games/quake/distinfo games/quake/distinfo
index 65e8c70..52cff00 100644
--- games/quake/distinfo
+++ games/quake/distinfo
@@ -1,10 +1,5 @@
-MD5 (quake-v6-bsd-kame.tar.gz) = Y0mR6FyifI6GfzhyaMDsSA==
-MD5 (quake6-00-v6-20000202b.diff.gz) = e2ENdOz/cIe8KjxfcYBoHQ==
-RMD160 (quake-v6-bsd-kame.tar.gz) = GEThk7YohsRSplxcV4D1jRloQQk=
-RMD160 (quake6-00-v6-20000202b.diff.gz) = UAbLdJ1o33OZrwG+nKrbH04nvo8=
-SHA1 (quake-v6-bsd-kame.tar.gz) = CdWO7znz2Ka3tyh8iPxm1N0/6ws=
-SHA1 (quake6-00-v6-20000202b.diff.gz) = pKHPF45Axe/7P6rQ+nRLu80KVqs=
-SHA256 (quake-v6-bsd-kame.tar.gz) =
RGNSs1nczuYCWvjjlSYUKbT26IVrxuuJ08dGRlYNEN0=
-SHA256 (quake6-00-v6-20000202b.diff.gz) =
7fhnPGsWfJANGkMggl2wfNYZR+Xt9LP+/f1tW/jjQ8s=
-SIZE (quake-v6-bsd-kame.tar.gz) = 4503326
-SIZE (quake6-00-v6-20000202b.diff.gz) = 3857
+MD5 (quakeforge-20110621.tar.gz) = cs2uc0+m2ql/zlM0bJmw1A==
+RMD160 (quakeforge-20110621.tar.gz) = QOYZXICuLW0xjePXZMadqQH2fUY=
+SHA1 (quakeforge-20110621.tar.gz) = kHL9O97tWCoHUz642S1lPmz+SXg=
+SHA256 (quakeforge-20110621.tar.gz) =
yGlEAgBIPk/0mTMDCipePzg9BtRkOXqFcFmAID5NPtc=
+SIZE (quakeforge-20110621.tar.gz) = 2623752
diff --git games/quake/files/snd_sndio.c games/quake/files/snd_sndio.c
deleted file mode 100644
index 2352b69..0000000
--- games/quake/files/snd_sndio.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2010 Jacob Meuser <jake...@sdf.lonestar.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "quakedef.h"
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <errno.h>
-
-#include <sndio.h>
-
-static struct sio_hdl *hdl;
-static qboolean snd_inited;
-
-unsigned char *dma_buffer;
-size_t dma_buffer_size, dma_ptr;
-
-qboolean
-SNDDMA_Init(void)
-{
- struct sio_par par;
- unsigned samp_per_buf;
- char *s;
- int i;
-
- if (snd_inited == true) {
- Con_Printf("Sound already inited\n");
- return false;
- }
-
- hdl = sio_open(NULL, SIO_PLAY, 1);
- if (hdl == NULL) {
- Con_Printf("Could not open sndio device\n");
- return false;
- }
-
- shm = &sn;
- shm->splitbuffer = 0;
-
- s = getenv("QUAKE_SOUND_CHANNELS");
- if (s)
- shm->channels = atoi(s);
- else if ((i = COM_CheckParm("-sndmono")) != 0)
- shm->channels = 1;
- else if ((i = COM_CheckParm("-sndstereo")) != 0)
- shm->channels = 2;
- else
- shm->channels = 2;
-
- sio_initpar(&par);
- par.rate = 11025;
- par.bits = 16;
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
- par.pchan = shm->channels;
- par.appbufsz = par.rate / 10; /* 1/10 second latency */
-
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- Con_Printf("Error setting audio parameters\n");
- sio_close(hdl);
- return false;
- }
- if ((par.pchan != 1 && par.pchan != 2) ||
- (par.bits != 16 || par.sig != 1)) {
- Con_Printf("Could not set appropriate audio parameters\n");
- sio_close(hdl);
- return false;
- }
- shm->speed = par.rate;
- shm->channels = par.pchan;
- shm->samplebits = par.bits;
-
- /*
- * find the smallest power of two larger than the buffer size
- * and use it as the internal buffer's size
- */
- for (i = 1; i < par.appbufsz; i <<= 1)
- ; /* nothing */
- shm->samples = i * par.pchan;
-
- dma_buffer_size = shm->samples * shm->samplebits / 8;
- dma_buffer = calloc(1, dma_buffer_size);
- if (dma_buffer == NULL) {
- Con_Printf("Could not allocate audio ring buffer\n");
- return false;
- }
- dma_ptr = 0;
- shm->buffer = dma_buffer;
- if (!sio_start(hdl)) {
- Con_Printf("Could not start audio\n");
- sio_close(hdl);
- return false;
- }
- shm->submission_chunk = 1;
- shm->soundalive = true;
- shm->samplepos = 0;
- snd_inited = true;
- return true;
-}
-
-void
-SNDDMA_Shutdown(void)
-{
- if (snd_inited == true) {
- sio_close(hdl);
- snd_inited = false;
- }
- free(dma_buffer);
-}
-
-int
-SNDDMA_GetDMAPos(void)
-{
- if (!snd_inited)
- return (0);
- shm->samplepos = dma_ptr / (shm->samplebits / 8);
- return shm->samplepos;
-}
-
-void
-SNDDMA_Submit(void)
-{
- struct pollfd pfd;
- size_t count, todo, avail;
- int n;
-
- n = sio_pollfd(hdl, &pfd, POLLOUT);
- while (poll(&pfd, n, 0) < 0 && errno == EINTR)
- ;
- if (!(sio_revents(hdl, &pfd) & POLLOUT))
- return;
- avail = dma_buffer_size;
- while (avail > 0) {
- todo = dma_buffer_size - dma_ptr;
- if (todo > avail)
- todo = avail;
- count = sio_write(hdl, dma_buffer + dma_ptr, todo);
- if (count == 0)
- break;
- dma_ptr += count;
- if (dma_ptr >= dma_buffer_size)
- dma_ptr -= dma_buffer_size;
- avail -= count;
- }
-}
diff --git games/quake/patches/patch-common_asm_i386_h
games/quake/patches/patch-common_asm_i386_h
deleted file mode 100644
index 155c8a0..0000000
--- games/quake/patches/patch-common_asm_i386_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-common_asm_i386_h,v 1.2 2008/01/11
16:48:44 ajacoutot Exp $
---- common/asm_i386.h.orig Mon Jan 10 17:59:31 2000
-+++ common/asm_i386.h Fri Jan 11 17:46:14 2008
-@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- #ifndef __ASM_I386__
- #define __ASM_I386__
-
--#ifdef ELF
-+#if defined(ELF) || defined(__ELF__)
- #define C(label) label
- #else
- #define C(label) _##label
diff --git games/quake/patches/patch-common_mdfour_c
games/quake/patches/patch-common_mdfour_c
deleted file mode 100644
index daa831e..0000000
--- games/quake/patches/patch-common_mdfour_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-common_mdfour_c,v 1.1 2009/02/14
10:39:39 jasper Exp $
-
-Fix potential 64-bit issue.
-
---- common/mdfour.c.orig Sat Feb 14 11:16:05 2009
-+++ common/mdfour.c Sat Feb 14 11:16:37 2009
-@@ -27,6 +27,8 @@
- #include "mdfour.h"
- #endif // _MDFOUR_H
-
-+#include <string.h>
-+
- /* NOTE: This code makes no attempt to be fast!
-
- It assumes that a int is at least 32 bits long
diff --git games/quake/patches/patch-common_snd_oss_c
games/quake/patches/patch-common_snd_oss_c
deleted file mode 100644
index 4ab325e..0000000
--- games/quake/patches/patch-common_snd_oss_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-common_snd_oss_c,v 1.2 2008/01/11
16:48:44 ajacoutot Exp $
---- common/snd_oss.c.orig Mon Jan 10 17:59:31 2000
-+++ common/snd_oss.c Fri Jan 11 17:46:14 2008
-@@ -30,6 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
- #endif
-+#if defined HAVE_SOUNDCARD_H
-+#include <soundcard.h>
-+#endif
- #if defined HAVE_SYS_SOUNDCARD_H
- # include <sys/soundcard.h>
- #elif defined HAVE_LINUX_SOUNDCARD_H
diff --git games/quake/patches/patch-common_vid_ggi_c
games/quake/patches/patch-common_vid_ggi_c
deleted file mode 100644
index 81476f8..0000000
--- games/quake/patches/patch-common_vid_ggi_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-common_vid_ggi_c,v 1.1 2009/02/14
10:39:39 jasper Exp $
-
-Fix potential 64-bit issue.
-
---- common/vid_ggi.c.orig Sat Feb 14 11:17:12 2009
-+++ common/vid_ggi.c Sat Feb 14 11:17:32 2009
-@@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-
- #define _BSD
-
-+#include <sys/types.h>
-+#include <unistd.h>
-
- #include <ctype.h>
- #include <stdlib.h>
diff --git games/quake/patches/patch-configure_in
games/quake/patches/patch-configure_in
deleted file mode 100644
index 4100343..0000000
--- games/quake/patches/patch-configure_in
+++ /dev/null
@@ -1,57 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-configure_in,v 1.2 2010/05/02
13:35:48 ratchov Exp $
---- configure.in.orig Tue Jan 11 03:10:13 2000
-+++ configure.in Fri Apr 30 04:58:10 2010
-@@ -15,7 +15,7 @@ AC_PROG_MAKE_SET
- dnl Checks for header files.
- AC_CHECK_HEADERS(unistd.h windows.h sys/ioctl.h sys/mman.h sys/asoundlib.h \
- sys/soundcard.h linux/soundcard.h machine/soundcard.h sys/audioio.h \
-- dsound.h mmsystem.h mme/mmsystem.h mme/mme_public.h)
-+ dsound.h mmsystem.h mme/mmsystem.h mme/mme_public.h sndio.h)
-
- dnl checks for compiler characteristics
- AC_PROG_GCC_TRADITIONAL
-@@ -232,10 +232,10 @@ if test "x$HAS_SVGA" != xyes; then
- fi
-
- dnl Make sure -lpthread works (for SDL)
--if test "x$HAS_SDL" = xyes; then
-- AC_CHECK_LIB(pthread, pthread_exit ,SDL_LIBS="$SDL_LIBS -lpthread"
-- HAS_SDL=yes, HAS_SDL=no, [$SDL_LIBS])
--fi
-+dnl if test "x$HAS_SDL" = xyes; then
-+dnl AC_CHECK_LIB(pthread, pthread_exit ,SDL_LIBS="$SDL_LIBS -lpthread"
-+dnl HAS_SDL=yes, HAS_SDL=no, [$SDL_LIBS])
-+dnl fi
- if test "x$HAS_SDL" != xyes; then
- SDL_CFLAGS="" SDL_LIBS=""
- fi
-@@ -407,6 +407,15 @@ QF_maGiC_VALUE
- ], SND_STYLE="OSS")
- fi
-
-+if test -z "$SND_STYLE" -a "x$ac_cv_header_sndio_h" = "xyes"; then
-+ AC_EGREP_CPP([QF_maGiC_VALUE],[
-+#include <sndio.h>
-+#ifdef SIO_PLAY
-+QF_maGiC_VALUE
-+#endif
-+ ], SND_STYLE="sndio"
-+ SND_LIBS="-lsndio")
-+fi
- if test -z "$SND_STYLE" -a "x$ac_cv_header_sys_audioio_h" = "xyes"; then
- AC_EGREP_CPP([QF_maGiC_VALUE],[
- #include <sys/audioio.h>
-@@ -453,6 +462,13 @@ case "${target}" in
- SYS_SRC="sys_linux.c"
- QW_CL_SYS_SRC="sys_linux.c"
- QW_SRV_SYS_SRC="sys_unix.c"
-+ ;;
-+ *-*-openbsd*)
-+ SYS_SRC="sys_unix.c"
-+ QW_CL_SYS_SRC="sys_linux.c"
-+ QW_SRV_SYS_SRC="sys_unix.c"
-+ SND_STYLE="sndio"
-+ DEFAULT_SYS=yes
- ;;
- *)
- SYS_SRC="sys_unix.c"
diff --git games/quake/patches/patch-m4_libFLAC_m4
games/quake/patches/patch-m4_libFLAC_m4
new file mode 100644
index 0000000..f051226
--- /dev/null
+++ games/quake/patches/patch-m4_libFLAC_m4
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/libFLAC.m4.orig Wed May 25 16:23:36 2011
++++ m4/libFLAC.m4 Wed May 25 16:22:38 2011
+@@ -21,7 +21,7 @@ AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest
+ LIBFLAC_LIBS="-L$libdir"
+ fi
+
+- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
++ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm -logg"
+
+ if test "x$libFLAC_includes" != "x" ; then
+ LIBFLAC_CFLAGS="-I$libFLAC_includes"
diff --git games/quake/patches/patch-qw_client_Makefile_in
games/quake/patches/patch-qw_client_Makefile_in
deleted file mode 100644
index a73810a..0000000
--- games/quake/patches/patch-qw_client_Makefile_in
+++ /dev/null
@@ -1,170 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-qw_client_Makefile_in,v 1.3
2010/05/02 13:35:48 ratchov Exp $
---- qw_client/Makefile.in.orig Fri Apr 30 01:51:08 2010
-+++ qw_client/Makefile.in Fri Apr 30 05:00:43 2010
-@@ -17,9 +17,10 @@ mandir = @mandir@
-
- BUILD_DIR = ../targets/qw_client
-
--LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm -L/usr/local/v6/lib -linet6
-+LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm
- LIBS = @LIBS@
- CC = @CC@
-+CC_GL = @CC@ -pthread
- INTEL_ARCH = @INTEL_ARCH@
-
- ifneq ($(SRC_DIR),.)
-@@ -77,7 +78,7 @@ RELEASE = @RELEASE@
- ifeq ($(RELEASE),yes)
- OPTFLAGS = @RELEASE_CFLAGS@
- else
--OPTFLAGS = -g
-+OPTFLAGS =
- endif
-
- targets = $(GGIQUAKE) $(SVGAQUAKE) $(GLQUAKE) $(TDFXQUAKE) $(X11QUAKE)
$(SDLQUAKE)
-@@ -131,6 +132,9 @@ endif
- ifeq ($(SND_STYLE),OSS)
- SND_SRC = snd_dma.c snd_oss.c
- endif
-+ifeq ($(SND_STYLE),sndio)
-+SND_SRC = snd_dma.c snd_sndio.c
-+endif
- ifeq ($(SND_STYLE),Solaris)
- SND_SRC = snd_dma.c snd_sun.c
- endif
-@@ -250,7 +254,7 @@ $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_x11_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_x11_DIR)
-@@ -264,7 +268,7 @@ endif
-
- $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_x11_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE)
-
-@@ -303,7 +307,7 @@ $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_svga_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_svga_DIR)
-@@ -317,7 +321,7 @@ endif
-
- $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_svga_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE)
-
-@@ -353,7 +357,7 @@ $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_ggi_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_ggi_DIR)
-@@ -367,7 +371,7 @@ endif
-
- $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_ggi_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE)
-
-@@ -398,30 +402,30 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR)
-
- $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-
- $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-
- ifneq ($(QW_COMMON_DIR),)
- $(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
- endif
-
- $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE)
-
- $(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
-- $(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o
$(BUILD_DIR)/../$(GLQUAKE)
-+ $(CC_GL) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o
$(BUILD_DIR)/../$(GLQUAKE)
-
- # XXX - Can this be automated?
- clean-$(GLQUAKE):
-@@ -450,7 +454,7 @@ $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_3dfx_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_3dfx_DIR)
-@@ -464,7 +468,7 @@ endif
-
- $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
-
-@@ -500,7 +504,7 @@ $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_sdl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_sdl_DIR)
-@@ -514,7 +518,7 @@ endif
-
- $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_sdl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(SDLQUAKE): $(BUILD_DIR)/../$(SDLQUAKE)
-
-@@ -540,7 +544,7 @@ clean: $(CLEAN_TARGETS)
- install: $(targets)
- $(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir)
- for i in $(targets); do \
-- $(PROJECT_DIR)/install-sh -m 755 $(BUILD_DIR)/../$$i \
-+ $(PROJECT_DIR)/install-sh -s -m 755 $(BUILD_DIR)/../$$i \
- $(DESTDIR)$(prefix)$(bindir)/$$i; \
- done
-
diff --git games/quake/patches/patch-qw_server_Makefile_in
games/quake/patches/patch-qw_server_Makefile_in
deleted file mode 100644
index 52fb31d..0000000
--- games/quake/patches/patch-qw_server_Makefile_in
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-qw_server_Makefile_in,v 1.2
2008/01/11 16:48:44 ajacoutot Exp $
---- qw_server/Makefile.in.orig Tue Jan 11 15:37:02 2000
-+++ qw_server/Makefile.in Fri Jan 11 17:46:15 2008
-@@ -16,7 +16,7 @@ COMMON_DIR=$(PROJECT_DIR)/common
- QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
- BUILD_DIR = ../targets/qw_server
-
--LDFLAGS = @LDFLAGS@ -lm -L/usr/local/v6/lib -linet6
-+LDFLAGS = @LDFLAGS@ -lm
- LIBS = @LIBS@
- CC = @CC@
- INTEL_ARCH = @INTEL_ARCH@
-@@ -109,7 +109,7 @@ $(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_srv_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_srv_DIR)
-@@ -121,7 +121,7 @@ $(BUILD_DIR)/srv/%.o: $(QW_COMMON_DIR)/%.c
-
- $(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_srv_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(SRVQUAKE): $(BUILD_DIR)/../$(SRVQUAKE)
-
-@@ -148,7 +148,7 @@ clean: $(CLEAN_TARGETS)
- install: $(targets)
- $(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir)
- for i in $(targets); do \
-- $(PROJECT_DIR)/install-sh -m 755 $(BUILD_DIR)/../$$i \
-+ $(PROJECT_DIR)/install-sh -s -m 755 $(BUILD_DIR)/../$$i \
- $(DESTDIR)$(prefix)$(bindir)/$$i; \
- done
-
diff --git games/quake/patches/patch-qw_server_sys_unix_c
games/quake/patches/patch-qw_server_sys_unix_c
deleted file mode 100644
index ade0418..0000000
--- games/quake/patches/patch-qw_server_sys_unix_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-qw_server_sys_unix_c,v 1.2
2008/01/11 16:48:44 ajacoutot Exp $
---- qw_server/sys_unix.c.orig Fri Jan 11 17:46:13 2008
-+++ qw_server/sys_unix.c Fri Jan 11 17:46:14 2008
-@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- #endif
-
- // FIXME: use autoconf
--#if defined(unix) || defined(_AIX) || defined(__NetBSD__)
-+#if defined(unix) || defined(_AIX) || defined(__NetBSD__) ||
defined(__OpenBSD__)
- #include <sys/stat.h>
- #include <unistd.h>
- #include <sys/time.h>
diff --git games/quake/patches/patch-uquake_Makefile_in
games/quake/patches/patch-uquake_Makefile_in
deleted file mode 100644
index a5dea51..0000000
--- games/quake/patches/patch-uquake_Makefile_in
+++ /dev/null
@@ -1,181 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-uquake_Makefile_in,v 1.3 2010/05/02
13:35:48 ratchov Exp $
---- uquake/Makefile.in.orig Fri Apr 30 01:51:08 2010
-+++ uquake/Makefile.in Fri Apr 30 05:01:31 2010
-@@ -16,9 +16,10 @@ mandir = @mandir@
- COMMON_DIR=$(PROJECT_DIR)/common
- BUILD_DIR =../targets/uquake
-
--LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm -L/usr/local/v6/lib -linet6
-+LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm
- LIBS = @LIBS@
- CC = @CC@
-+CC_GL = @CC@ -pthread
- INTEL_ARCH = @INTEL_ARCH@
-
- ifneq ($(SRC_DIR),.)
-@@ -76,7 +77,7 @@ RELEASE = @RELEASE@
- ifeq ($(RELEASE),yes)
- OPTFLAGS = @RELEASE_CFLAGS@
- else
--OPTFLAGS = -g
-+OPTFLAGS =
- endif
-
- targets = $(GGIQUAKE) $(SVGAQUAKE) $(GLQUAKE) $(TDFXQUAKE) $(X11QUAKE)
$(SDLQUAKE)
-@@ -124,6 +125,9 @@ endif
- ifeq ($(SND_STYLE),OSS)
- SND_SRC = snd_dma.c snd_oss.c
- endif
-+ifeq ($(SND_STYLE),sndio)
-+SND_SRC = snd_dma.c snd_sndio.c
-+endif
- ifeq ($(SND_STYLE),Solaris)
- SND_SRC = snd_dma.c snd_sun.c
- endif
-@@ -195,7 +199,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
- # Directory specific stuff
- #
- DEFS = @DEFS@
--CFLAGS = @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
-+CFLAGS += @CFLAGS@ -g $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
- -I$(COMMON_DIR) -I$(SRC_DIR)/include
- ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(X11_VID_SRC) model.c
- ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC)
-@@ -236,7 +240,7 @@ $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_x11_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_x11_DIR)
-@@ -244,7 +248,7 @@ $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.c
-
- $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_x11_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE)
-
-@@ -283,7 +287,7 @@ $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_svga_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_svga_DIR)
-@@ -291,7 +295,7 @@ $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.c
-
- $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_svga_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE)
-
-@@ -313,7 +317,7 @@ ALL_GGI_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(GGI_VID_
- OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@,
$(basename $(ALL_GGI_SRC) .c .s)))
-
- GGI_CFLAGS = -DGGI @GGI_CFLAGS@
--GGI_LDFLAGS = @GGI_LIBS@
-+GGI_LDFLAGS = -pthread @GGI_LIBS@
- GGI_VID_SRC = vid_ggi.c
-
- # This can be thought of as a macro that makes sure that the ggi
-@@ -327,7 +331,7 @@ $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_ggi_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_ggi_DIR)
-@@ -335,7 +339,7 @@ $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c
-
- $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_ggi_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE)
-
-@@ -365,24 +369,24 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR)
-
- $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-
- $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
-
- $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC_GL) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE)
-
- $(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
-- $(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o
$(BUILD_DIR)/../$(GLQUAKE)
-+ $(CC_GL) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o
$(BUILD_DIR)/../$(GLQUAKE)
-
- # XXX - Can this be automated?
- clean-$(GLQUAKE):
-@@ -411,7 +415,7 @@ $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_3dfx_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_3dfx_DIR)
-@@ -419,7 +423,7 @@ $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
-
- $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_gl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
-
-@@ -455,7 +459,7 @@ $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c
-
- $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s
- $(MAKE_SURE_sdl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c
- $(MAKE_SURE_sdl_DIR)
-@@ -463,7 +467,7 @@ $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c
-
- $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s
- $(MAKE_SURE_sdl_DIR)
-- $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-+ $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
- $(SDLQUAKE): $(BUILD_DIR)/../$(SDLQUAKE)
-
-@@ -489,7 +493,7 @@ clean: $(CLEAN_TARGETS)
- install: $(targets)
- $(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir)
- for i in $(targets); do \
-- $(PROJECT_DIR)/install-sh -m 755 $(BUILD_DIR)/../$$i \
-+ $(PROJECT_DIR)/install-sh -s -m 755 $(BUILD_DIR)/../$$i \
- $(DESTDIR)$(prefix)$(bindir)/$$i; \
- done
-
diff --git games/quake/patches/patch-uquake_menu_c
games/quake/patches/patch-uquake_menu_c
deleted file mode 100644
index 1f39a6e..0000000
--- games/quake/patches/patch-uquake_menu_c
+++ /dev/null
@@ -1,189 +0,0 @@
-$OpenBSD: ports/games/quake/patches/patch-uquake_menu_c,v 1.1.1.1 2001/08/03
13:02:16 espie Exp $
---- uquake/menu.c.orig Mon Jan 10 17:59:38 2000
-+++ uquake/menu.c Fri Aug 3 14:41:45 2001
-@@ -316,6 +316,18 @@ void M_Main_Key (int key)
- CL_NextDemo ();
- break;
-
-+ case K_HOME:
-+ case KP_HOME:
-+ S_LocalSound ("misc/menu1.wav");
-+ m_main_cursor = 0;
-+ break;
-+
-+ case K_END:
-+ case KP_END:
-+ S_LocalSound ("misc/menu1.wav");
-+ m_main_cursor = MAIN_ITEMS-1;
-+ break;
-+
- case KP_DOWNARROW:
- case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav");
-@@ -398,6 +410,18 @@ void M_SinglePlayer_Key (int key)
- M_Menu_Main_f ();
- break;
-
-+ case K_HOME:
-+ case KP_HOME:
-+ S_LocalSound ("misc/menu1.wav");
-+ m_singleplayer_cursor = 0;
-+ break;
-+
-+ case K_END:
-+ case KP_END:
-+ S_LocalSound ("misc/menu1.wav");
-+ m_singleplayer_cursor = SINGLEPLAYER_ITEMS-1;
-+ break;
-+
- case KP_DOWNARROW:
- case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav");
-@@ -444,8 +468,9 @@ void M_SinglePlayer_Key (int key)
- /* LOAD/SAVE MENU */
-
- int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES
-+int max_savegames; // actual value
-
--#define MAX_SAVEGAMES 12
-+#define MAX_SAVEGAMES 80
- char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
- int loadable[MAX_SAVEGAMES];
-
-@@ -456,7 +481,11 @@ void M_ScanSaves (void)
- FILE *f;
- int version;
-
-- for (i=0 ; i<MAX_SAVEGAMES ; i++)
-+ max_savegames = (vid.height - 48)/8;
-+ if (max_savegames > MAX_SAVEGAMES)
-+ max_savegames = MAX_SAVEGAMES;
-+
-+ for (i=0 ; i<max_savegames ; i++)
- {
- strcpy (m_filenames[i], "--- UNUSED SLOT ---");
- loadable[i] = false;
-@@ -509,7 +538,7 @@ void M_Load_Draw (void)
- p = Draw_CachePic ("gfx/p_load.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
-
-- for (i=0 ; i< MAX_SAVEGAMES; i++)
-+ for (i=0 ; i< max_savegames; i++)
- M_Print (16, 32 + 8*i, m_filenames[i]);
-
- // line cursor
-@@ -525,7 +554,7 @@ void M_Save_Draw (void)
- p = Draw_CachePic ("gfx/p_save.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
-
-- for (i=0 ; i<MAX_SAVEGAMES ; i++)
-+ for (i=0 ; i<max_savegames ; i++)
- M_Print (16, 32 + 8*i, m_filenames[i]);
-
- // line cursor
-@@ -557,6 +586,34 @@ void M_Load_Key (int k)
- Cbuf_AddText (va ("load s%i\n", load_cursor) );
- return;
-
-+ case K_PGDN:
-+ case KP_PGDN:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor+= 10;
-+ if (load_cursor >= max_savegames)
-+ load_cursor -= max_savegames;
-+ break;
-+
-+ case K_PGUP:
-+ case KP_PGUP:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor-= 10;
-+ if (load_cursor < 0)
-+ load_cursor += max_savegames;
-+ break;
-+
-+ case K_HOME:
-+ case KP_HOME:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor = 0;
-+ break;
-+
-+ case K_END:
-+ case KP_END:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor = max_savegames-1;
-+ break;
-+
- case KP_UPARROW:
- case K_UPARROW:
- case KP_LEFTARROW:
-@@ -564,7 +621,7 @@ void M_Load_Key (int k)
- S_LocalSound ("misc/menu1.wav");
- load_cursor--;
- if (load_cursor < 0)
-- load_cursor = MAX_SAVEGAMES-1;
-+ load_cursor = max_savegames-1;
- break;
-
- case KP_DOWNARROW:
-@@ -573,7 +630,7 @@ void M_Load_Key (int k)
- case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav");
- load_cursor++;
-- if (load_cursor >= MAX_SAVEGAMES)
-+ if (load_cursor >= max_savegames)
- load_cursor = 0;
- break;
- }
-@@ -595,6 +652,34 @@ void M_Save_Key (int k)
- Cbuf_AddText (va("save s%i\n", load_cursor));
- return;
-
-+ case K_PGDN:
-+ case KP_PGDN:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor+= 10;
-+ if (load_cursor >= max_savegames)
-+ load_cursor -= max_savegames;
-+ break;
-+
-+ case K_PGUP:
-+ case KP_PGUP:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor-= 10;
-+ if (load_cursor < 0)
-+ load_cursor += max_savegames;
-+ break;
-+
-+ case K_HOME:
-+ case KP_HOME:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor = 0;
-+ break;
-+
-+ case K_END:
-+ case KP_END:
-+ S_LocalSound ("misc/menu1.wav");
-+ load_cursor = max_savegames-1;
-+ break;
-+
- case KP_UPARROW:
- case K_UPARROW:
- case KP_LEFTARROW:
-@@ -602,7 +687,7 @@ void M_Save_Key (int k)
- S_LocalSound ("misc/menu1.wav");
- load_cursor--;
- if (load_cursor < 0)
-- load_cursor = MAX_SAVEGAMES-1;
-+ load_cursor = max_savegames-1;
- break;
-
- case KP_DOWNARROW:
-@@ -611,7 +696,7 @@ void M_Save_Key (int k)
- case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav");
- load_cursor++;
-- if (load_cursor >= MAX_SAVEGAMES)
-+ if (load_cursor >= max_savegames)
- load_cursor = 0;
- break;
- }
diff --git games/quake/pkg/DESCR-libs games/quake/pkg/DESCR-libs
new file mode 100644
index 0000000..6fdec30
--- /dev/null
+++ games/quake/pkg/DESCR-libs
@@ -0,0 +1,2 @@
+Quake is a 3D action game, which can be played both single-user as multi-
+user. This package holds common libraries for client and server packages.
diff --git games/quake/pkg/DESCR-main games/quake/pkg/DESCR-main
index bfd8332..ec00a9a 100644
--- games/quake/pkg/DESCR-main
+++ games/quake/pkg/DESCR-main
@@ -1,8 +1,12 @@
Quake is a 3D action game, which can be played both single-user as multi-
user. This package holds binaries for Quake, QuakeWorld.
-Note that you must have quake datafiles from elsewhere. The directory
-in which you launch quake should contain the following:
+Note that you must have quake datafiles from elsewhere.
+
+System wide data directory : ${PREFIX}/share/quakeforge
+Per-user game data directory: ~/.quakeforge
+
+One of those directories should contain the following:
./id1/
./id1/pak0.pak
@@ -16,8 +20,3 @@ You can optionally also have the following:
./rogue/config.cfg
./hipnotic/
./hipnotic/pak0.pak
-
-Flavors:
- sdl uses sdl library, allows full screen.
- ggi uses ggi library, somewhat theoretical interest.
- gl uses gl library, OpenGL accelerated.
diff --git games/quake/pkg/DESCR-server games/quake/pkg/DESCR-server
index e4e28dc..0c60515 100644
--- games/quake/pkg/DESCR-server
+++ games/quake/pkg/DESCR-server
@@ -1,8 +1,12 @@
Quake is a 3D action game, which can be played both single-user as multi-
-user. This package holds a binary server for Quake World.
+user. This package holds server binaries.
-Note that you must have quake datafiles from elsewhere. The directory
-in which you launch quake should contain the following:
+Note that you must have quake datafiles from elsewhere.
+
+System wide data directory : ${PREFIX}/share/quakeforge
+Per-user game data directory: ~/.quakeforge
+
+One of those directories should contain the following:
./id1/
./id1/pak0.pak
diff --git games/quake/pkg/PFRAG.shared-libs games/quake/pkg/PFRAG.shared-libs
new file mode 100644
index 0000000..a469ceb
--- /dev/null
+++ games/quake/pkg/PFRAG.shared-libs
@@ -0,0 +1,20 @@
+@comment $OpenBSD$
+@lib lib/libQFcd.so.${LIBQFcd_VERSION}
+@lib lib/libQFconsole.so.${LIBQFconsole_VERSION}
+@lib lib/libQFgamecode.so.${LIBQFgamecode_VERSION}
+@lib lib/libQFgib.so.${LIBQFgib_VERSION}
+@lib lib/libQFimage.so.${LIBQFimage_VERSION}
+@lib lib/libQFjs.so.${LIBQFjs_VERSION}
+@lib lib/libQFmodels.so.${LIBQFmodels_VERSION}
+@lib lib/libQFmodels_gl.so.${LIBQFmodels_gl_VERSION}
+@lib lib/libQFmodels_sw.so.${LIBQFmodels_sw_VERSION}
+@lib lib/libQFrenderer_gl.so.${LIBQFrenderer_gl_VERSION}
+@lib lib/libQFrenderer_sw32.so.${LIBQFrenderer_sw32_VERSION}
+@lib lib/libQFruamoko.so.${LIBQFruamoko_VERSION}
+@lib lib/libQFsound.so.${LIBQFsound_VERSION}
+@lib lib/libQFutil.so.${LIBQFutil_VERSION}
+lib/quakeforge/plugins/cd_file.so
+lib/quakeforge/plugins/cd_sdl.so
+lib/quakeforge/plugins/console_client.so
+lib/quakeforge/plugins/console_server.so
+lib/quakeforge/plugins/snd_output_disk.so
diff --git games/quake/pkg/PLIST-libs games/quake/pkg/PLIST-libs
new file mode 100644
index 0000000..a86ae2c
--- /dev/null
+++ games/quake/pkg/PLIST-libs
@@ -0,0 +1,148 @@
+@comment $OpenBSD$
+@pkgpath ${BASE_PKGPATH},-libs
+%%SHARED%%
+include/QF/
+include/QF/GL/
+include/QF/GL/ati.h
+include/QF/GL/defines.h
+include/QF/GL/extensions.h
+include/QF/GL/funcs.h
+include/QF/GL/qf_explosions.h
+include/QF/GL/qf_funcs_list.h
+include/QF/GL/qf_lightmap.h
+include/QF/GL/qf_noisetextures.h
+include/QF/GL/qf_rlight.h
+include/QF/GL/qf_rmain.h
+include/QF/GL/qf_rsurf.h
+include/QF/GL/qf_sky.h
+include/QF/GL/qf_textures.h
+include/QF/GL/qf_vid.h
+include/QF/GL/types.h
+include/QF/bspfile.h
+include/QF/cbuf.h
+include/QF/cdaudio.h
+include/QF/checksum.h
+include/QF/clip_hull.h
+include/QF/cmd.h
+include/QF/console.h
+include/QF/crc.h
+include/QF/csqc.h
+include/QF/cvar.h
+include/QF/draw.h
+include/QF/dstring.h
+include/QF/gib.h
+include/QF/hash.h
+include/QF/hl.h
+include/QF/idparse.h
+include/QF/image.h
+include/QF/in_event.h
+include/QF/info.h
+include/QF/input.h
+include/QF/joystick.h
+include/QF/keys.h
+include/QF/link.h
+include/QF/llist.h
+include/QF/locs.h
+include/QF/mathlib.h
+include/QF/mdfour.h
+include/QF/model.h
+include/QF/modelgen.h
+include/QF/msg.h
+include/QF/object.h
+include/QF/pak.h
+include/QF/pakfile.h
+include/QF/pcx.h
+include/QF/plugin/
+include/QF/plugin.h
+include/QF/plugin/cd.h
+include/QF/plugin/console.h
+include/QF/plugin/general.h
+include/QF/plugin/input.h
+include/QF/plugin/snd_output.h
+include/QF/plugin/snd_render.h
+include/QF/png.h
+include/QF/pr_comp.h
+include/QF/pr_debug.h
+include/QF/pr_obj.h
+include/QF/progs.h
+include/QF/qargs.h
+include/QF/qdefs.h
+include/QF/qendian.h
+include/QF/qfplist.h
+include/QF/qtypes.h
+include/QF/quakefs.h
+include/QF/quakeio.h
+include/QF/render.h
+include/QF/riff.h
+include/QF/ruamoko.h
+include/QF/screen.h
+include/QF/script.h
+include/QF/sizebuf.h
+include/QF/skin.h
+include/QF/sound.h
+include/QF/spritegn.h
+include/QF/sys.h
+include/QF/teamplay.h
+include/QF/tga.h
+include/QF/uint32.h
+include/QF/va.h
+include/QF/ver_check.h
+include/QF/vid.h
+include/QF/view.h
+include/QF/wad.h
+include/QF/wadfile.h
+include/QF/zone.h
+lib/pkgconfig/qfcc.pc
+lib/pkgconfig/quakeforge.pc
+lib/qfcc/
+lib/qfcc/include/
+lib/qfcc/include/Array.h
+lib/qfcc/include/AutoreleasePool.h
+lib/qfcc/include/Entity.h
+lib/qfcc/include/Object.h
+lib/qfcc/include/PropertyList.h
+lib/qfcc/include/Protocol.h
+lib/qfcc/include/cbuf.h
+lib/qfcc/include/cmd.h
+lib/qfcc/include/crudefile.h
+lib/qfcc/include/cvar.h
+lib/qfcc/include/debug.h
+lib/qfcc/include/draw.h
+lib/qfcc/include/entities.h
+lib/qfcc/include/file.h
+lib/qfcc/include/gib.h
+lib/qfcc/include/gui/
+lib/qfcc/include/gui/Group.h
+lib/qfcc/include/gui/InputLine.h
+lib/qfcc/include/gui/Pic.h
+lib/qfcc/include/gui/Point.h
+lib/qfcc/include/gui/Rect.h
+lib/qfcc/include/gui/Size.h
+lib/qfcc/include/gui/Slider.h
+lib/qfcc/include/gui/Text.h
+lib/qfcc/include/gui/View.h
+lib/qfcc/include/hash.h
+lib/qfcc/include/infokey.h
+lib/qfcc/include/key.h
+lib/qfcc/include/math.h
+lib/qfcc/include/message.h
+lib/qfcc/include/nq_message.h
+lib/qfcc/include/physics.h
+lib/qfcc/include/plist.h
+lib/qfcc/include/qfile.h
+lib/qfcc/include/qfs.h
+lib/qfcc/include/qw_message.h
+lib/qfcc/include/qw_physics.h
+lib/qfcc/include/qw_sys.h
+lib/qfcc/include/runtime.h
+lib/qfcc/include/script.h
+lib/qfcc/include/server.h
+lib/qfcc/include/sound.h
+lib/qfcc/include/string.h
+lib/qfcc/include/sv_sound.h
+lib/qfcc/include/system.h
+lib/qfcc/lib/
+lib/quakeforge/
+lib/quakeforge/plugins/
+lib/quakeforge/plugins/snd_output_sdl.so
+lib/quakeforge/plugins/snd_render_default.so
diff --git games/quake/pkg/PLIST-main games/quake/pkg/PLIST-main
index 188a0cf..66a6678 100644
--- games/quake/pkg/PLIST-main
+++ games/quake/pkg/PLIST-main
@@ -1,4 +1,40 @@
@comment $OpenBSD: ports/games/quake/pkg/PLIST-main,v 1.4 2009/02/14 10:39:39
jasper Exp $
@pkgpath ${BASE_PKGPATH}
-@bin bin/quake${FLAVORS}
-@bin bin/qw-client${FLAVORS}
+@bin bin/bsp2img
+@comment @bin bin/hw-master
+@bin bin/nq-glx
+@bin bin/nq-sdl
+@bin bin/nq-sdl32
+@bin bin/nq-sgl
+@bin bin/nq-x11
+@bin bin/pak
+@bin bin/qfbsp
+@bin bin/qfcc
+@bin bin/qflight
+@bin bin/qflmp
+@bin bin/qfmodelgen
+@bin bin/qfpc
+bin/qfpreqcc
+@bin bin/qfprogs
+@bin bin/qfvis
+@bin bin/qfwavinfo
+@bin bin/qtv
+@bin bin/qw-client-glx
+@bin bin/qw-client-sdl
+@bin bin/qw-client-sdl32
+@bin bin/qw-client-sgl
+@bin bin/qw-client-x11
+@bin bin/qw-master
+@bin bin/wad
+bin/zpak
+@man man/man1/pak.1
+@man man/man1/qfcc.1
+@man man/man1/qflight.1
+@man man/man1/qfvis.1
+@man man/man1/wad.1
+@man man/man1/zpak.1
+share/quakeforge/
+share/quakeforge/QF/
+share/quakeforge/QF/menu.dat.gz
+share/quakeforge/QF/menu.plist
+share/quakeforge/QF/menu.sym.gz
diff --git games/quake/pkg/PLIST-server games/quake/pkg/PLIST-server
index c2e0942..51f76cc 100644
--- games/quake/pkg/PLIST-server
+++ games/quake/pkg/PLIST-server
@@ -1,6 +1,4 @@
@comment $OpenBSD: ports/games/quake/pkg/PLIST-server,v 1.4 2010/02/26
18:08:51 espie Exp $
-@pkgpath games/quake,-server,sdl
-@pkgpath games/quake,-server,ggi
-@pkgpath games/quake,-server,x11
-@pkgpath games/quake,-server,gl
+@pkgpath ${BASE_PKGPATH},-server
+@bin bin/nq-server
@bin bin/qw-server
