ports/70331: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4
Christopher Nehren
apeiron at comcast.net
Wed Aug 11 22:50:28 UTC 2004
>Number: 70331
>Category: ports
>Synopsis: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4
>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: Wed Aug 11 22:50:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Christopher Nehren
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prophecy.dyndns.org 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun Aug 8 22:14:06 EDT 2004 root at prophecy.dyndns.org:/usr/src/sys/i386/compile/PROPHECY i386
>Description:
QuakeForge has been updated to 0.5.5. This release includes a great myriad
number of bug fixes, including the much sought-after ability to load save
files (d'oh!), x11/glx mouse input fixing, etc. They even incorporated most of
the patches that were in the files/ directory! However, it's also broken on
GCC 3.4. Fix that while I'm here, and in a way that works with older GCCs as
well.(1) If someone can explain to me the GCC 3.4 black voodoo behind why it
works with the new way and not with the old way, I'd appreciate it.
(1): Note, this is untested on anything but the GCC in -CURRENT, but I can't
see how it would possibly break. Also note that the fix only covers the
svgalib frontends, and svgalib itself is broken on FreeBSD (d'oh ** 2!).
Also note that the plist for this port is quite complex. I've done my best to
get everything right, but something may have slipped through. Testing welcome.
>How-To-Repeat:
Visit http://www.quakeforge.net/ , compare with the version in the FreeBSD
ports tree.
>Fix:
diff -burN quakeforge/Makefile new.quakeforge/Makefile
--- quakeforge/Makefile Fri Jul 9 13:42:24 2004
+++ new.quakeforge/Makefile Wed Aug 11 18:35:33 2004
@@ -6,8 +6,7 @@
#
PORTNAME= QuakeForge
-PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTVERSION= 0.5.5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:qf/} \
ftp://ftp.idsoftware.com/idstuff/quakeworld/unix/:qw
@@ -89,7 +88,7 @@
PLIST_SUB+= TOOL:="@comment "
.else
PLIST_SUB+= TOOL:=""
-MAN1= pak.1 qfcc.1 qflight.1 qfvis.1
+MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
.endif
.if defined(WITHOUT_CLIENTS)
diff -burN quakeforge/distinfo new.quakeforge/distinfo
--- quakeforge/distinfo Thu Mar 18 13:00:29 2004
+++ new.quakeforge/distinfo Wed Aug 11 18:35:12 2004
@@ -1,5 +1,5 @@
-MD5 (quakeforge-0.5.4.tar.gz) = 45688b3d2eb8ccf3284e59e8c34a4d35
-SIZE (quakeforge-0.5.4.tar.gz) = 2391110
+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
diff -burN quakeforge/files/patch-configure new.quakeforge/files/patch-configure
--- quakeforge/files/patch-configure Wed Nov 26 15:29:40 2003
+++ new.quakeforge/files/patch-configure Wed Aug 11 18:35:12 2004
@@ -1,28 +1,5 @@
--- configure.orig Sun Jul 27 13:19:51 2003
+++ configure Sun Jul 27 13:41:57 2003
-@@ -2042,10 +2042,10 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--if test ${CFLAGS-unset} = unset; then
-+if test "${CFLAGS-unset}" = unset; then
- CFLAGS=""
- fi
--if test ${AR-unset} = unset; then
-+if test "${AR-unset}" = unset; then
- AR="ar"
- fi
- export AR
-@@ -8333,6 +8333,9 @@
- else
- CPP_NAME="cpp %d -o %o %i"
- case "$target_os" in
-+ *freebsd*)
-+ CPP_NAME="cpp %d %i %o"
-+ ;;
- *bsd*)
- touch conftest.c
- CPP_NAME="`(f=\`$CC -v -E -Dfoo conftest.c -o conftest.i 2>&1 | grep -e -Dfoo\`; set $f; echo "$1")` %d %i %o"
@@ -10726,7 +10729,7 @@
int
main ()
diff -burN quakeforge/files/patch-ltmain.sh new.quakeforge/files/patch-ltmain.sh
--- quakeforge/files/patch-ltmain.sh Fri Aug 8 09:23:08 2003
+++ new.quakeforge/files/patch-ltmain.sh Wed Aug 11 18:35:12 2004
@@ -1,11 +0,0 @@
---- ltmain.sh.orig Sun Jul 27 16:09:51 2003
-+++ ltmain.sh Sun Jul 27 16:10:01 2003
-@@ -1052,7 +1052,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
diff -burN quakeforge/pkg-message new.quakeforge/pkg-message
--- quakeforge/pkg-message Sat Feb 1 07:51:47 2003
+++ new.quakeforge/pkg-message Wed Aug 11 18:35:12 2004
@@ -1,7 +1,7 @@
===============================================
Install models, skins, maps and mods in
-${PREFIX}/share/quakeforge
+\${HOME}/share/quakeforge
ATTENTION: Don't run the -svga clients, they
will probably render your keyboard/video/mouse,
diff -burN quakeforge/pkg-plist new.quakeforge/pkg-plist
--- quakeforge/pkg-plist Sun Jan 25 15:39:30 2004
+++ new.quakeforge/pkg-plist Wed Aug 11 18:35:12 2004
@@ -1,3 +1,6 @@
+bin/qfpreqcc
+bin/qtv
+bin/wad
bin/zpak
%%SERVER:%%bin/qw-server
%%SERVER:%%bin/qw-master
@@ -35,6 +38,9 @@
%%CLIENT:%%lib/libQFsound.so
%%CLIENT:%%lib/libQFsound.la
%%CLIENT:%%lib/libQFsound.a
+%%CLIENT:%%lib/quakeforge/cd_file.so
+%%CLIENT:%%lib/quakeforge/cd_file.la
+%%CLIENT:%%lib/quakeforge/cd_file.a
lib/libQFconsole.so.1
lib/libQFconsole.so
lib/libQFconsole.la
@@ -51,14 +57,18 @@
lib/libQFgib.so
lib/libQFgib.la
lib/libQFgib.a
-lib/libQFcsqc.so.1
-lib/libQFcsqc.so
-lib/libQFcsqc.la
-lib/libQFcsqc.a
+lib/libQFimage.so.1
+lib/libQFimage.la
+lib/libQFimage.a
lib/libQFmodels.so.1
lib/libQFmodels.so
lib/libQFmodels.la
lib/libQFmodels.a
+lib/libQFruamoko.so.1
+lib/libQFruamoko.la
+lib/libQFruamoko.a
+%%TOOL:%%lib/ruamoko/libnq.a
+%%TOOL:%%lib/ruamoko/libqw.a
%%TOOL:%%lib/ruamoko/libr.a
%%TOOL:%%lib/ruamoko/libgui.a
%%TOOL:%%lib/ruamoko/libcsqc.a
@@ -310,6 +320,7 @@
%%SKIN:%%share/quakeforge/qw/skins/watchmen.txt
%%SKIN:%%share/quakeforge/qw/skins/wolfpak.pcx
%%SKIN:%%share/quakeforge/qw/skins/wolfpak.txt
+include/QF/GL/ati.h
include/QF/GL/defines.h
include/QF/GL/extensions.h
include/QF/GL/funcs.h
@@ -347,22 +358,26 @@
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.h
+include/QF/png.h
include/QF/pr_comp.h
include/QF/pr_debug.h
include/QF/pr_obj.h
@@ -376,6 +391,22 @@
include/QF/quakeio.h
include/QF/render.h
include/QF/riff.h
+include/QF/ruamoko/gui/Group.h
+include/QF/ruamoko/gui/InputLine.h
+include/QF/ruamoko/gui/Pic.h
+include/QF/ruamoko/gui/Point.h
+include/QF/ruamoko/gui/Rect.h
+include/QF/ruamoko/gui/Size.h
+include/QF/ruamoko/gui/Slider.h
+include/QF/ruamoko/gui/Text.h
+include/QF/ruamoko/gui/View.h
+include/QF/ruamoko/qfs.h
+include/QF/ruamoko/server.h
+include/QF/ruamoko/AutoreleasePool.h
+include/QF/ruamoko/List.h
+include/QF/ruamoko/ListNode.h
+include/QF/ruamoko/Stack.h
+include/QF/ruamoko.h
include/QF/screen.h
include/QF/sizebuf.h
include/QF/skin.h
@@ -383,7 +414,6 @@
include/QF/spritegn.h
include/QF/sys.h
include/QF/teamplay.h
-include/QF/texture.h
include/QF/tga.h
include/QF/uint32.h
include/QF/va.h
@@ -391,6 +421,7 @@
include/QF/vid.h
include/QF/view.h
include/QF/wad.h
+include/QF/wadfile.h
include/QF/zone.h
include/QF/ruamoko/crudefile.h
include/QF/ruamoko/debug.h
@@ -414,10 +445,6 @@
include/QF/ruamoko/file.h
include/QF/ruamoko/Object.h
include/QF/ruamoko/Entity.h
-include/QF/ruamoko/InputLine.h
-include/QF/ruamoko/Point.h
-include/QF/ruamoko/Rect.h
-include/QF/ruamoko/Size.h
include/QF/ruamoko/qfile.h
include/QF/ruamoko/gib.h
include/QF/ruamoko/hash.h
@@ -476,6 +503,7 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/QF/GL
@dirrm include/QF/plugin
+ at dirrm include/QF/ruamoko/gui
@dirrm include/QF/ruamoko
@dirrm include/QF
%%TOOL:%%@dirrm lib/ruamoko
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list