Date: Mon, 10 Feb 2003 19:25:20 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48158: [Maintainer-Update]: games/quake2forge to 0.2.1 Message-ID: <200302101825.h1AIPKaG089382@roadrunner.local>
next in thread | raw e-mail | index | archive | help
>Number: 48158
>Category: ports
>Synopsis: [Maintainer-Update]: games/quake2forge to 0.2.1
>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: Mon Feb 10 10:40:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.7-STABLE: Mon Nov 18 09:46:38 CET 2002 i386
>Description:
>How-To-Repeat:
Please remove all patches in files/
Please add patch-main.c to files/
>Fix:
--- q2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 31 Jan 2003 09:55:59 -0000 1.1
+++ Makefile 10 Feb 2003 18:17:57 -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
@@ -19,11 +19,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)
@@ -86,6 +86,16 @@
${INSTALL_MAN} ${WRKSRC}/docs/README.* ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/quake2
${INSTALL_MAN} ${WRKSRC}/docs/ctf/* ${PREFIX}/share/doc/quake2/ctf
.endif
+# Remove those crappy libtool archives, if someone knows how to make libtool not even build
+# those, let me know!
+ @${RM} ${PREFIX}/lib/quake2/ref_softx.la \
+ ${PREFIX}/lib/quake2/ref_tdfx.la \
+ ${PREFIX}/lib/quake2/ref_glx.la \
+ ${PREFIX}/lib/quake2/ref_sdlgl.la \
+ ${PREFIX}/lib/quake2/ref_softsdl.la \
+ ${PREFIX}/lib/quake2/ref_soft.la \
+ ${PREFIX}/lib/quake2/ctf/game.la \
+ ${PREFIX}/lib/quake2/baseq2/game.la
post-install:
@${CAT} ${PKGMESSAGE} | ${SED} -e 's#$${PREFIX}#${PREFIX}#g'
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 10 Feb 2003 18:17:57 -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 10 Feb 2003 18:17:57 -0000
@@ -1,25 +1,19 @@
bin/quake2
%%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
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.axp
%%PORTDOCS%%share/doc/quake2/README.install
%%PORTDOCS%%share/doc/quake2/README.linux
%%PORTDOCS%%share/doc/quake2/README.sdl
%%PORTDOCS%%share/doc/quake2/README.solaris
+%%PORTDOCS%%share/doc/quake2/README.Solaris
+%%PORTDOCS%%share/doc/quake2/README.joystick
%%PORTDOCS%%share/doc/quake2/TODO-ctf.txt
%%PORTDOCS%%share/doc/quake2/changes-ctf.txt
%%PORTDOCS%%share/doc/quake2/changes.txt
--- q2.patch ends here ---
--- patch-main.c begins here ---
--- 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"
--- patch-main.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
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?200302101825.h1AIPKaG089382>