Date: Fri, 13 Aug 2004 19:20:28 GMT From: Christopher Nehren <apeiron@comcast.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/70331: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4 Message-ID: <200408131920.i7DJKSqa039413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/70331; it has been noted by GNATS.
From: Christopher Nehren <apeiron@comcast.net>
To: Pav Lucistnik <pav@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70331: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4
Date: Fri, 13 Aug 2004 15:16:59 -0400
--dTy3Mrz/UPE2dbVg
Content-Type: multipart/mixed; boundary="IS0zKkzwUGydFO0o"
Content-Disposition: inline
--IS0zKkzwUGydFO0o
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Aug 13, 2004 at 14:04:57 EDT, Pav Lucistnik scribbled these
curious markings:
> Doh, the "fixed" patch is badly eaten by quoted-printable, can you
> please resend again, in text/plain, inline, without mime and
> quoted-printable?
Doh indeed. Here it is. If this doesn't work, I'll just throw it on my
web server.
--=20
I abhor a system designed for the "user", if that word is a coded
pejorative meaning "stupid and unsophisticated". -- Ken Thompson
-
Unix is user friendly. However, it isn't idiot friendly.
--IS0zKkzwUGydFO0o
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline; filename="quakeforge-0.5.5.patch"
Content-Transfer-Encoding: quoted-printable
diff -burN quakeforge/Makefile new.quakeforge/Makefile
--- quakeforge/Makefile Fri Jul 9 13:42:24 2004
+++ new.quakeforge/Makefile Fri Aug 13 14:56:06 2004
@@ -6,8 +6,7 @@
#
=20
PORTNAME=3D QuakeForge
-PORTVERSION=3D 0.5.4
-PORTREVISION=3D 2
+PORTVERSION=3D 0.5.5
CATEGORIES=3D games
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE:S/$/:qf/} \
ftp://ftp.idsoftware.com/idstuff/quakeworld/unix/:qw
@@ -89,7 +88,7 @@
PLIST_SUB+=3D TOOL:=3D"@comment "
.else
PLIST_SUB+=3D TOOL:=3D""
-MAN1=3D pak.1 qfcc.1 qflight.1 qfvis.1
+MAN1=3D pak.1 qfcc.1 qflight.1 qfvis.1 wad.1
.endif
=20
.if defined(WITHOUT_CLIENTS)
diff -burN quakeforge/distinfo new.quakeforge/distinfo
--- quakeforge/distinfo Thu Mar 18 13:00:29 2004
+++ new.quakeforge/distinfo Fri Aug 13 15:01:24 2004
@@ -1,5 +1,5 @@
-MD5 (quakeforge-0.5.4.tar.gz) =3D 45688b3d2eb8ccf3284e59e8c34a4d35
-SIZE (quakeforge-0.5.4.tar.gz) =3D 2391110
+MD5 (quakeforge-0.5.5.tar.gz) =3D 5e8059546ed8797245bf9ba6a62b3fb3
+SIZE (quakeforge-0.5.5.tar.gz) =3D 2659432
MD5 (qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz) =3D 75333c66edd156a1695=
452d3971169d7
SIZE (qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz) =3D 205578
MD5 (quakesw-1.0.6.tar.gz) =3D 663b749612d55de29f74966ec3168918
diff -burN quakeforge/files/patch-configure new.quakeforge/files/patch-conf=
igure
--- quakeforge/files/patch-configure Wed Nov 26 15:29:40 2003
+++ new.quakeforge/files/patch-configure Fri Aug 13 14:57:24 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=3D$ac_cv_c_compiler_gnu
-=20
-=20
--if test ${CFLAGS-unset} =3D unset; then
-+if test "${CFLAGS-unset}" =3D unset; then
- CFLAGS=3D""
- fi
--if test ${AR-unset} =3D unset; then
-+if test "${AR-unset}" =3D unset; then
- AR=3D"ar"
- fi
- export AR
-@@ -8333,6 +8333,9 @@
- else
- CPP_NAME=3D"cpp %d -o %o %i"
- case "$target_os" in
-+ *freebsd*)
-+ CPP_NAME=3D"cpp %d %i %o"
-+ ;;
- *bsd*)
- touch conftest.c
- CPP_NAME=3D"`(f=3D\`$CC -v -E -Dfoo conftest.c -o conftest.i 2>&1 | gr=
ep -e -Dfoo\`; set $f; echo "$1")` %d %i %o"
@@ -10726,7 +10729,7 @@
int
main ()
diff -burN quakeforge/files/patch-libs::video::targets::vid_svgalib.c new.q=
uakeforge/files/patch-libs::video::targets::vid_svgalib.c
--- quakeforge/files/patch-libs::video::targets::vid_svgalib.c Wed Dec 31 1=
9:00:00 1969
+++ new.quakeforge/files/patch-libs::video::targets::vid_svgalib.c Fri Aug =
13 15:02:41 2004
@@ -0,0 +1,40 @@
+--- libs/video/targets/vid_svgalib.c.orig Fri Aug 13 15:01:41 2004
++++ libs/video/targets/vid_svgalib.c Fri Aug 13 15:02:01 2004
+@@ -82,6 +82,19 @@
+ byte *VGA_pagebase;
+ int VID_options_items =3D 0;
+=20
++#if defined(i386) && defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ =
=3D=3D 2 && __GLIBC_MINOR__ < 2))
++void
++outb (unsigned char val, unsigned short port)
++{
++ asm ("outb %b0, %w1" : :"a"(val), "d"(port));
++}
++#elif defined(__FreeBSD__)
++static inline void
++outb (unsigned char value, unsigned short port)
++{
++ __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "d" (port));
++}
++#endif
+=20
+ void
+ D_BeginDirectRect (int x, int y, byte * pbitmap, int width, int height)
+@@ -486,17 +499,3 @@
+ {
+ return false;
+ }
+-
+-#if defined(i386) && defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ =
=3D=3D 2 && __GLIBC_MINOR__ < 2))
+-void
+-outb (unsigned char val, unsigned short port)
+-{
+- asm ("outb %b0, %w1" : :"a"(val), "d"(port));
+-}
+-#elif defined(__FreeBSD__)
+-static inline void
+-outb (unsigned char value, unsigned short port)
+-{
+- __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "d" (port));
+-}
+-#endif
diff -burN quakeforge/files/patch-ltmain.sh new.quakeforge/files/patch-ltma=
in.sh
--- quakeforge/files/patch-ltmain.sh Fri Aug 8 09:23:08 2003
+++ new.quakeforge/files/patch-ltmain.sh Wed Dec 31 19:00:00 1969
@@ -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" =3D "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-plist new.quakeforge/pkg-plist
--- quakeforge/pkg-plist Sun Jan 25 15:39:30 2004
+++ new.quakeforge/pkg-plist Fri Aug 13 15:04:14 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
+@dirrm include/QF/ruamoko/gui
@dirrm include/QF/ruamoko
@dirrm include/QF
%%TOOL:%%@dirrm lib/ruamoko
--IS0zKkzwUGydFO0o--
--dTy3Mrz/UPE2dbVg
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (FreeBSD)
iD8DBQFBHROrk/lo7zvzJioRAkefAJ43eLje6RcJmIAO0c/k/V7aZNaA4gCdE7Gx
beZQr/I0ITm0t+Rg0z2jUTM=
=1OTr
-----END PGP SIGNATURE-----
--dTy3Mrz/UPE2dbVg--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408131920.i7DJKSqa039413>