Date: Mon, 10 Mar 2003 18:20:14 -0800 (PST) From: Eric Anholt <eta@lclark.edu> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/48158: [Maintainer-Update]: games/quake2forge to 0.2.1 Message-ID: <200303110220.h2B2KEvE025489@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/48158; it has been noted by GNATS. From: Eric Anholt <eta@lclark.edu> To: freebsd-gnats-submit@FreeBSD.org, q@uni.de Cc: Subject: Re: ports/48158: [Maintainer-Update]: games/quake2forge to 0.2.1 Date: 10 Mar 2003 18:19:58 -0800 --=-j5JEEbVBzm4MvY2hKpCX Content-Type: text/plain Content-Transfer-Encoding: 7bit How about the following diff? It stops the .la building (http://www.freebsd.org/gnome/docs/porting.html recommended it), fixes packaging (ref_tdfx.so depends on svga too), and sorts the pkg-plist. I've submitted the ref_tdfx.so fix to portmgr for inclusion of quake2forge in 4.8. -- Eric Anholt eta@lclark.edu http://people.freebsd.org/~anholt/ anholt@FreeBSD.org --=-j5JEEbVBzm4MvY2hKpCX Content-Disposition: attachment; filename=quake2forge-2.diff Content-Type: text/x-patch; name=quake2forge-2.diff; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== RCS file: /home/ncvs/ports/games/quake2forge/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 28 Feb 2003 22:52:59 -0000 1.3 +++ Makefile 4 Mar 2003 21:28:21 -0000 @@ -6,7 +6,7 @@ # PORTNAME= quake2forge -PORTVERSION= 0.1 +PORTVERSION= 0.2.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= quake @@ -20,11 +20,11 @@ USE_LIBTOOL= yes USE_XLIB= yes INSTALLS_SHLIB= yes -LDCONFIG_DIRS= ${PREFIX}/lib ${PREFIX}/lib/quake2 +LDCONFIG_DIRS= ${PREFIX}/lib/quake2 ${PREFIX}/lib/quake2/baseq2 ${PREFIX}/lib/quake2/ctf .include <bsd.port.pre.mk> -CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} --enable-static=no +CONFIGURE_ARGS= --enable-static=no CONFIGURE_TARGET= .if exists(${LOCALBASE}/lib/libSDL-1.1.so.5) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/games/quake2forge/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 31 Jan 2003 09:55:59 -0000 1.1 +++ distinfo 11 Feb 2003 01:30:35 -0000 @@ -1 +1 @@ -MD5 (quake2-0.1.tar.bz2) = 8bbaa5bcf089cc7f113ad743f705fab0 +MD5 (quake2-0.2.1.tar.bz2) = 564bef79bd83f3b9fc1d34a19b29ae2c Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/games/quake2forge/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 31 Jan 2003 09:55:59 -0000 1.1 +++ pkg-plist 11 Mar 2003 01:56:36 -0000 @@ -1,30 +1,22 @@ bin/quake2 +%%GL:%%lib/quake2/ref_glx.so %%SVGA:%%lib/quake2/ref_soft.so -%%SVGA:%%lib/quake2/ref_soft.la %%SDL:%%lib/quake2/ref_softsdl.so -%%SDL:%%lib/quake2/ref_softsdl.la -%%SDLGL:%%lib/quake2/ref_sdlgl.so -%%SDLGL:%%lib/quake2/ref_sdlgl.la -%%GL:%%lib/quake2/ref_glx.so -%%GL:%%lib/quake2/ref_glx.la -%%GL:%%lib/quake2/ref_tdfx.so -%%GL:%%lib/quake2/ref_tdfx.la lib/quake2/ref_softx.so -lib/quake2/ref_softx.la +%%SDLGL:%%lib/quake2/ref_sdlgl.so +%%SVGA:%%%%GL%%lib/quake2/ref_tdfx.so lib/quake2/baseq2/game.so -lib/quake2/baseq2/game.la lib/quake2/ctf/game.so -lib/quake2/ctf/game.la +%%PORTDOCS%%share/doc/quake2/README.Solaris %%PORTDOCS%%share/doc/quake2/README.axp %%PORTDOCS%%share/doc/quake2/README.install +%%PORTDOCS%%share/doc/quake2/README.joystick %%PORTDOCS%%share/doc/quake2/README.linux %%PORTDOCS%%share/doc/quake2/README.sdl %%PORTDOCS%%share/doc/quake2/README.solaris %%PORTDOCS%%share/doc/quake2/TODO-ctf.txt %%PORTDOCS%%share/doc/quake2/changes-ctf.txt %%PORTDOCS%%share/doc/quake2/changes.txt -%%PORTDOCS%%share/doc/quake2/joystick.txt -%%PORTDOCS%%share/doc/quake2/readme.txt %%PORTDOCS%%share/doc/quake2/ctf/admin.gif %%PORTDOCS%%share/doc/quake2/ctf/adminset.gif %%PORTDOCS%%share/doc/quake2/ctf/automac.gif @@ -40,6 +32,8 @@ %%PORTDOCS%%share/doc/quake2/ctf/tech2.gif %%PORTDOCS%%share/doc/quake2/ctf/tech3.gif %%PORTDOCS%%share/doc/quake2/ctf/tech4.gif +%%PORTDOCS%%share/doc/quake2/joystick.txt +%%PORTDOCS%%share/doc/quake2/readme.txt %%PORTDOCS%%@dirrm share/doc/quake2/ctf %%PORTDOCS%%@dirrm share/doc/quake2 @dirrm lib/quake2/baseq2 Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 31 Jan 2003 09:55:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ ---- src/snd.c.orig Fri Oct 18 16:08:56 2002 -+++ src/snd.c Tue Oct 15 17:56:17 2002 -@@ -211,12 +211,7 @@ - sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE); - sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE); - sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE); --/* merged in from snd_bsd.c -- jaq */ --#ifdef __linux__ - snddevice = Cvar_Get("snddevice", "/dev/dsp", CVAR_ARCHIVE); --#else /* bsd */ -- snddevice = Cvar_Get("snddevice", "/dev/audio", CVAR_ARCHIVE); --#endif - } - - // open /dev/dsp, check capability to mmap, and get size of dma buffer -@@ -321,24 +316,6 @@ - if (dma.channels < 1 || dma.channels > 2) - dma.channels = 2; - -- if (mmapped) { -- dma.samples = info.fragstotal * info.fragsize / (dma.samplebits/8); -- dma.submission_chunk = 1; -- -- // memory map the dma buffer -- -- if (!dma.buffer) -- dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal -- * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); -- if (!dma.buffer || dma.buffer == MAP_FAILED) { -- perror(snddevice->string); -- Com_Printf("SNDDMA_Init: Could not mmap %s.\n", snddevice->string); -- close(audio_fd); -- audio_fd = -1; -- return 0; -- } -- } -- - tmp = 0; - if (dma.channels == 2) - tmp = 1; -@@ -432,6 +409,28 @@ - } else { - tmp = 0; - rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); -+ dma.samples = info.fragstotal * info.fragsize / (dma.samplebits/8); -+ dma.submission_chunk = 1; -+ -+ // memory map the dma buffer -+ -+ if (!dma.buffer) { -+ dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal * info.fragsize, -+#if (defined(__FreeBSD__) && (__FreeBSD_version < 500000)) -+ PROT_READ|PROT_WRITE, -+#else -+ PROT_WRITE, -+#endif -+ MAP_FILE|MAP_SHARED, audio_fd, 0); -+ } -+ if (!dma.buffer || dma.buffer == MAP_FAILED) { -+ perror(snddevice->string); -+ Com_Printf("SNDDMA_Init: Could not mmap %s.\n", snddevice->string); -+ close(audio_fd); -+ audio_fd = -1; -+ return 0; -+ } -+ - if (rc < 0) { - perror(snddevice->string); - Com_Printf("SNDDMA_Init: Could not toggle. (1)\n"); Index: files/patch-ab =================================================================== RCS file: files/patch-ab diff -N files/patch-ab --- files/patch-ab 31 Jan 2003 09:55:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ ---- configure.orig Wed Sep 18 07:02:16 2002 -+++ configure Thu Oct 31 17:55:52 2002 -@@ -2789,7 +2789,7 @@ - echo "$as_me: error: this package needs a convenience libltdl" >&2;} - { (exit 1); exit 1; }; } ;; - "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+ ac_configure_args="--enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la - LTDLINCL='-I${top_srcdir}/''libltdl' -@@ -9633,9 +9633,9 @@ - - - --# Check whether --with-gl or --without-gl was given. --if test "${with_gl+set}" = set; then -- withval="$with_gl" -+# Check whether --with-opengl or --without-opengl was given. -+if test "${with_opengl+set}" = set; then -+ withval="$with_opengl" - HAVE_OPENGL=$withval - else - HAVE_OPENGL=auto -@@ -9763,7 +9763,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lGL $OPENGL_LIBS -+LIBS="-lGL $OPENGL_LIBS -lX11 -lXext - $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -9814,7 +9814,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5 - echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6 - if test $ac_cv_lib_GL_glBegin = yes; then -- OPENGL_LIBS="$OPENGL_LIBS -lGL" -+ OPENGL_LIBS="$OPENGL_LIBS -lGL -lX11 -lXext" - HAVE_OPENGL=yes - else - HAVE_OPENGL=no Index: files/patch-ac =================================================================== RCS file: files/patch-ac diff -N files/patch-ac --- files/patch-ac 31 Jan 2003 09:55:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- src/Makefile.am.orig Thu Oct 31 20:08:06 2002 -+++ src/Makefile.am Thu Oct 31 20:11:19 2002 -@@ -79,15 +79,15 @@ - #ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@ - ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ - #ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@ --ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ -+ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ @OPENGL_LIBS@ - ref_glx_la_LDFLAGS = $(module_ldflags) - endif - - # ref_tdfx - if BUILD_TDFX - ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c --ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ --ref_tdfx_la_LDADD = @SVGALIB_LIBS@ -+ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@ -+ref_tdfx_la_LDADD = @SVGALIB_LIBS@ @OPENGL_LIBS@ - ref_tdfx_la_LDFLAGS = $(module_ldflags) - endif - Index: files/patch-ad =================================================================== RCS file: files/patch-ad diff -N files/patch-ad --- files/patch-ad 31 Jan 2003 09:55:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ ---- src/Makefile.in.orig Thu Oct 31 20:07:59 2002 -+++ src/Makefile.in Thu Oct 31 20:11:21 2002 -@@ -200,13 +200,13 @@ - #ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@ - @BUILD_GLX_TRUE@ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ - #ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@ --@BUILD_GLX_TRUE@ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ -+@BUILD_GLX_TRUE@ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ @OPENGL_LIBS@ - @BUILD_GLX_TRUE@ref_glx_la_LDFLAGS = $(module_ldflags) - - # ref_tdfx - @BUILD_TDFX_TRUE@ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c --@BUILD_TDFX_TRUE@ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ --@BUILD_TDFX_TRUE@ref_tdfx_la_LDADD = @SVGALIB_LIBS@ -+@BUILD_TDFX_TRUE@ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@ -+@BUILD_TDFX_TRUE@ref_tdfx_la_LDADD = @SVGALIB_LIBS@ @OPENGL_LIBS@ - @BUILD_TDFX_TRUE@ref_tdfx_la_LDFLAGS = $(module_ldflags) - - # ref_sdlgl Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 11 Mar 2003 00:54:28 -0000 @@ -0,0 +1,10 @@ +--- configure.orig Mon Mar 10 16:54:16 2003 ++++ configure Mon Mar 10 16:54:17 2003 +@@ -7829,6 +7829,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' Index: files/patch-main.c =================================================================== RCS file: files/patch-main.c diff -N files/patch-main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-main.c 11 Feb 2003 01:29:42 -0000 @@ -0,0 +1,24 @@ +--- src/main.c.orig Fri Feb 7 14:25:46 2003 ++++ src/main.c Fri Feb 7 14:34:14 2003 +@@ -49,12 +49,21 @@ + #include <mntent.h> + #elif defined(__FreeBSD__) || defined(__bsd__) || defined (__NetBSD__) + #include <fstab.h> ++ #include <pthread.h> + #elif defined(__sun__) + #include <sys/file.h> + #endif + + #ifdef HAVE_DLOPEN + # include <dlfcn.h> ++#endif ++ ++/* This should probably go into configure ++ * BSDs and Linux have SIGIO, Solaris needs SIGPOLL ++ * This should probably be changed the other way round ++ * SIGIO as default and SIGPOLL only for Solrais */ ++#ifndef SIGPOLL ++#define SIGPOLL SIGIO + #endif + + #include "qcommon.h" --=-j5JEEbVBzm4MvY2hKpCX-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303110220.h2B2KEvE025489>