Date: Thu, 5 Aug 2004 14:27:50 +0200 (CEST) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70029: [MAINTAINER] games/quake2forge: update to 0.3 Message-ID: <200408051227.i75CRofp083680@roadrunner.q.local> Resent-Message-ID: <200408051230.i75CUVxO073308@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70029
>Category: ports
>Synopsis: [MAINTAINER] games/quake2forge: update to 0.3
>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: Thu Aug 05 12:30:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.2-CURRENT FreeBSD 5.2-CURRENT #18: Tue Jul 13 22:32:09 CEST 2004
>Description:
- Update to 0.3
Note: files/patch-configure and files/patch-main.c are gone
New file: files/patch-configure.in
Sorry for the mess...
>How-To-Repeat:
>Fix:
--- quake2forge-0.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile 14 Mar 2004 06:16:33 -0000 1.10
+++ Makefile 5 Aug 2004 12:23:28 -0000
@@ -2,15 +2,13 @@
# Date created: 20.01.2003
# Whom: Ulrich Spoerlein <q@uni.de>
#
-# $FreeBSD$
+# $FreeBSD: ports/games/quake2forge/Makefile,v 1.10 2004/03/14 06:16:33 ade Exp $
#
PORTNAME= quake2forge
-PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= quake
+MASTER_SITES= ftp://ftp.quakeforge.net/quake2forge/
DISTNAME= quake2-${PORTVERSION}
MAINTAINER= q@uni.de
@@ -18,16 +16,16 @@
USE_BZIP2= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_AUTOCONF_VER=259
USE_XLIB= yes
-INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
WANT_SDL= yes
-LDCONFIG_DIRS= ${PREFIX}/lib/quake2 ${PREFIX}/lib/quake2/baseq2 ${PREFIX}/lib/quake2/ctf
.include <bsd.port.pre.mk>
-CONFIGURE_ARGS= --enable-static=no --program-transform-name='s/^quake2$$/q2f/'
-CONFIGURE_TARGET=
+CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/q2f/'
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
@@ -37,6 +35,19 @@
WITH_SVGALIB= yes
.endif
+.if exists(${LOCALBASE}/lib/libao.so.3)
+WITH_LIBAO= yes
+.endif
+
+.if !defined (WITHOUT_LIBAO) && defined(WITH_LIBAO)
+LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
+CONFIGURE_ARGS+=--with-ao=${LOCALBASE}
+PLIST_SUB+= AO:=""
+.else
+CONFIGURE_ARGS+=--without-ao
+PLIST_SUB+= AO:="@comment "
+.endif
+
.if !defined (WITHOUT_SVGALIB) && defined(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
CONFIGURE_ARGS+=--with-svgalib=${LOCALBASE}
@@ -70,6 +81,9 @@
.endif
pre-everything::
+.if !defined(WITH_LIBAO)
+ @${ECHO_MSG} "Define WITH_LIBAO to use libao"
+.endif
.if !defined(WITH_SVGALIB)
@${ECHO_MSG} "Define WITH_SVGALIB to use svgalib"
.endif
@@ -80,13 +94,18 @@
@${ECHO_MSG} "Define WITHOUT_GL to disable GL"
.endif
+.if ${OSVERSION} < 500000
+post-patch:
+ @${REINPLACE_CMD} -e 's/%zu/%u/g' ${WRKSRC}/src/main.c
+.endif
+
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/quake2
${MKDIR} ${PREFIX}/share/doc/quake2/ctf
${INSTALL_MAN} ${WRKSRC}/docs/README.* ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/quake2
- ${INSTALL_MAN} ${WRKSRC}/docs/ctf/* ${PREFIX}/share/doc/quake2/ctf
+ ${INSTALL_MAN} ${WRKSRC}/docs/ctf/*.html ${WRKSRC}/docs/ctf/*.gif \
+ ${WRKSRC}/docs/ctf/*.jpg ${PREFIX}/share/doc/quake2/ctf
.endif
post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- distinfo 18 Mar 2004 18:00:28 -0000 1.3
+++ distinfo 5 Aug 2004 12:23:28 -0000
@@ -1,2 +1,2 @@
-MD5 (quake2-0.2.1.tar.bz2) = 564bef79bd83f3b9fc1d34a19b29ae2c
-SIZE (quake2-0.2.1.tar.bz2) = 1286703
+MD5 (quake2-0.3.tar.bz2) = af115d76a2f09d5847acb10e55bfa850
+SIZE (quake2-0.3.tar.bz2) = 1383644
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist 31 Oct 2003 13:37:24 -0000 1.4
+++ pkg-plist 5 Aug 2004 12:23:28 -0000
@@ -5,6 +5,9 @@
%%GL:%%lib/quake2/ref_glx.so
%%SVGA:%%%%GL:%%lib/quake2/ref_tdfx.so
lib/quake2/ref_softx.so
+lib/quake2/snd_oss.so
+%%SDL:%%lib/quake2/snd_sdl.so
+%%AO:%%lib/quake2/snd_ao.so
lib/quake2/baseq2/game.so
lib/quake2/ctf/game.so
%%PORTDOCS%%share/doc/quake2/README.axp
@@ -14,6 +17,7 @@
%%PORTDOCS%%share/doc/quake2/README.sdl
%%PORTDOCS%%share/doc/quake2/README.solaris
%%PORTDOCS%%share/doc/quake2/README.Solaris
+%%PORTDOCS%%share/doc/quake2/README.sound
%%PORTDOCS%%share/doc/quake2/TODO-ctf.txt
%%PORTDOCS%%share/doc/quake2/changes-ctf.txt
%%PORTDOCS%%share/doc/quake2/changes.txt
@@ -37,8 +41,6 @@
%%PORTDOCS%%@dirrm share/doc/quake2/ctf
%%PORTDOCS%%@dirrm share/doc/quake2
@dirrm lib/quake2/baseq2
-@dirrm lib/quake2/xatrix
-@dirrm lib/quake2/rogue
@dirrm lib/quake2/ctf
@dirrm lib/quake2
@unexec rm %D/share/quake2/baseq2/config.cfg 2>/dev/null || true
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/games/quake2forge/files/patch-configure,v
retrieving revision 1.1
diff -u -u -r1.1 patch-configure
--- files/patch-configure 28 Mar 2003 10:23:20 -0000 1.1
+++ files/patch-configure 5 Aug 2004 12:23:28 -0000
@@ -1,10 +0,0 @@
---- 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: /home/ncvs/ports/games/quake2forge/files/patch-main.c,v
retrieving revision 1.3
diff -u -u -r1.3 patch-main.c
--- files/patch-main.c 30 Jun 2003 12:32:07 -0000 1.3
+++ files/patch-main.c 5 Aug 2004 12:23:28 -0000
@@ -1,42 +0,0 @@
---- 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"
-@@ -518,7 +527,7 @@
- ret = fread(ptr, size, nitems, fp);
- err = errno;
- if (ret != nitems) {
-- printf("verify_fread(...,%d,%d,...): return value: %d\n", size, nitems, ret);
-+ printf("verify_fread(...,%lu,%lu,...): return value: %lu\n", (unsigned long)size, (unsigned long)nitems, (unsigned long)ret);
- if (ret == 0 && ferror(fp)) {
- printf(" error: %s\n", strerror(err));
- printf(" fileno=%d\n", fileno(fp));
-@@ -536,7 +545,7 @@
- ret = fwrite(ptr, size, nitems, fp);
- err = errno;
- if (ret != nitems) {
-- printf("verify_fwrite(...,%d,%d,...) = %d\n", size, nitems, ret);
-+ printf("verify_fwrite(...,%lu,%lu,...) = %lu\n", (unsigned long)size, (unsigned long)nitems, (unsigned long)ret);
- if (ret == 0 && ferror(fp)) {
- printf(" error: %s\n", strerror(err));
- printf(" fileno=%d\n", fileno(fp));
--- /dev/null Thu Aug 5 14:23:28 2004
+++ files/patch-configure.in Thu Aug 5 10:00:54 2004
@@ -0,0 +1,18 @@
+--- configure.in.orig Tue Mar 16 11:07:38 2004
++++ configure.in Thu Aug 5 09:59:56 2004
+@@ -109,6 +109,7 @@
+ # test for the library first, for people who may have the libs
+ # installed but no headers
+ AC_CHECK_LIB(vga, vga_getmousetype,
++ SVGALIB_LIBS="$SVGALIB_LIBS -lvga"
+ HAVE_SVGALIB=maybe,
+ HAVE_SVGALIB=no,
+ [ $SVGALIB_LIBS ]
+@@ -125,7 +126,6 @@
+ # if it's all there, define the relevant bits
+ if test "x$HAVE_SVGALIB" = xyes ; then
+ AC_DEFINE(HAVE_SVGALIB, 1, [Define this if you have SVGAlib])
+- SVGALIB_LIBS="-lvga"
+ AC_SUBST(SVGALIB_CFLAGS)
+ AC_SUBST(SVGALIB_LIBS)
+ else
--- quake2forge-0.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408051227.i75CRofp083680>