Date: Wed, 11 Aug 2004 19:43:33 -0400 From: Christopher Nehren <apeiron@comcast.net> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/70331: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4 Message-ID: <20040811234333.GA6556@prophecy.dyndns.org> In-Reply-To: <200408112250.i7BMoM78088895@freefall.freebsd.org> References: <200408112243.i7BMhlnM050665@prophecy.dyndns.org> <200408112250.i7BMoM78088895@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Aug 11, 2004 at 18:50:22 EDT, FreeBSD-gnats-submit@FreeBSD.org scri= bbled these curious markings: > Thank you very much for your problem report. > It has the internal identification `ports/70331'. > The individual assigned to look at your > report is: freebsd-ports-bugs.=20 >=20 > You can access the state of your problem report at any time > via this link: >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D70331 >=20 > >Category: ports > >Responsible: freebsd-ports-bugs > >Synopsis: Update games/quakeforge to 0.5.5, unbreak for GCC 3.4 > >Arrival-Date: Wed Aug 11 22:50:22 GMT 2004 Whoops. I completely borked that patch. Here's the working version. Note that patch-ltmain.sh is no longer necessary. diff -burN quakeforge/Makefile new.quakeforge/Makefile --- quakeforge/Makefile Fri Jul 9 13:42:24 2004 +++ new.quakeforge/Makefile Wed Aug 11 19:34:36 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 Wed Aug 11 19:34:44 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 Wed Aug 11 19:35:40 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 Wed Aug = 11 19:37:27 2004 @@ -0,0 +1,39 @@ +--- libs/video/targets/vid_svgalib.c.orig Wed Aug 11 19:36:45 2004 ++++ libs/video/targets/vid_svgalib.c Wed Aug 11 19:37:02 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) +@@ -487,16 +500,3 @@ + return false; + } +=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 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-message new.quakeforge/pkg-message --- quakeforge/pkg-message Sat Feb 1 07:51:47 2003 +++ new.quakeforge/pkg-message Wed Aug 11 19:33:55 2004 @@ -1,7 +1,7 @@ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Install models, skins, maps and mods in -${PREFIX}/share/quakeforge +{HOME}/share/quakeforge =20 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 19:33:55 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 --=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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040811234333.GA6556>