Attachment 50145 Details for Bug 76454 – file.diff

[patch] file.diff

file.diff (text/plain), 10.82 KB, created by Chuck Swiger on 2005-01-19 07:30:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chuck Swiger

Created: 2005-01-19 07:30:29 UTC

Size: 10.82 KB

patch

obsolete

>diff -durP bzflag1/Makefile bzflag/Makefile
>--- bzflag1/Makefile	Wed Dec 22 23:58:56 2004
>+++ bzflag/Makefile	Wed Jan 19 00:37:26 2005
>@@ -6,15 +6,22 @@
> #
> 
> PORTNAME=	bzflag
>-PORTVERSION=	1.10.8
>+PORTVERSION=	2.0.0
> CATEGORIES=	games
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}-${PORTVERSION}.20041007
>+# SourceForge mirroring for BZFlag-2 is broken at the moment
>+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+#MASTER_SITE_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	http://www.pkix.net/mirror/sf.net/ \
>+		ftp://ftp.sucs.org/pub/linux/
>+DISTNAME=	${PORTNAME}-${PORTVERSION}.20050117
> 
> MAINTAINER=	chuck@pkix.net
> COMMENT=	A multiplayer 3D tank battle game
> 
>+BUILD_DEPENDS=	${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl
>+
>+USE_BZIP2=	yes
>+USE_SDL=	yes
> USE_GL=		yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>@@ -24,7 +31,8 @@
> MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
> 		AUTOHEADER="${TRUE}"
> 
>-MAN6=	bzadmin.6 bzflag.6 bzfls.6 bzfquery.6 bzfrelay.6 bzfs.6
>+MAN5=	bzw.5
>+MAN6=	bzadmin.6 bzflag.6 bzfquery.6 bzfs.6
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|@LINUX_TRUE@||g ; \
>diff -durP bzflag1/distinfo bzflag/distinfo
>--- bzflag1/distinfo	Mon Oct 11 20:09:21 2004
>+++ bzflag/distinfo	Tue Jan 18 17:01:25 2005
>@@ -1,2 +1,2 @@
>-MD5 (bzflag-1.10.8.20041007.tar.gz) = 881a2ee873bf87fa44fd2837fa9e974e
>-SIZE (bzflag-1.10.8.20041007.tar.gz) = 4244335
>+MD5 (bzflag-2.0.0.20050117.tar.bz2) = 16da32cfaac130bf68ca156d0dec2b2e
>+SIZE (bzflag-2.0.0.20050117.tar.bz2) = 8297220
>Only in bzflag1/files: patch-XWindow.h
>diff -durP bzflag1/files/patch-configure bzflag/files/patch-configure
>--- bzflag1/files/patch-configure	Sun Jan 25 14:52:47 2004
>+++ bzflag/files/patch-configure	Wed Jan 19 01:56:49 2005
>@@ -1,6 +1,6 @@
>---- configure.orig	Sat Jan 24 20:15:57 2004
>-+++ configure	Sun Jan 25 00:24:23 2004
>-@@ -323,7 +323,7 @@
>+--- configure.orig	Tue Jan 18 17:13:36 2005
>++++ configure	Tue Jan 18 17:16:43 2005
>+@@ -63,7 +63,7 @@
>  prefix=NONE
>  program_prefix=NONE
>  program_suffix=NONE
>@@ -9,12 +9,11 @@
>  silent=
>  site=
>  srcdir=
>-@@ -6065,7 +6065,7 @@
>- 
>- # avoid using X11 in BeOS
>- if test $host_os != beos; then
>--  CPPFLAGS=
>-+  CPPFLAGS="$X_CFLAGS $CPPFLAGS"
>-   if test x$no_x = x; then
>-     GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
>-   fi
>+@@ -4198,6 +4198,7 @@
>+   beos*)
>+     ;;
>+   *)
>++    CPPFLAGS="$X_CFLAGS $CPPFLAGS"
>+     if test x$no_x = x; then
>+       GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
>+     fi
>diff -durP bzflag1/files/patch-src::bzadmin::StdBothUI.cxx bzflag/files/patch-src::bzadmin::StdBothUI.cxx
>--- bzflag1/files/patch-src::bzadmin::StdBothUI.cxx	Thu Dec 11 09:23:16 2003
>+++ bzflag/files/patch-src::bzadmin::StdBothUI.cxx	Wed Jan 19 01:56:13 2005
>@@ -1,5 +1,5 @@
>---- src/bzadmin/StdBothUI.cxx.orig	Tue Dec  9 16:38:14 2003
>-+++ src/bzadmin/StdBothUI.cxx	Thu Dec 11 01:25:29 2003
>+--- src/bzadmin/StdBothUI.cxx.orig	Tue Jan 18 18:28:44 2005
>++++ src/bzadmin/StdBothUI.cxx	Wed Jan 19 00:05:11 2005
> @@ -20,6 +20,7 @@
>  #include <ws2tcpip.h>
>  #include <wincon.h>
>Only in bzflag1/files: patch-src::bzflag::HUDRenderer.cxx
>Only in bzflag1/files: patch-usbjoy.cxx
>diff -durP bzflag1/pkg-plist bzflag/pkg-plist
>--- bzflag1/pkg-plist	Mon Oct 11 20:09:21 2004
>+++ bzflag/pkg-plist	Wed Jan 19 01:39:52 2005
>@@ -1,107 +1,160 @@
> bin/bzadmin
> bin/bzflag
>-bin/bzfrelay
> bin/bzfs
>-share/bzflag/blue_basetop.png
>-share/bzflag/blue_basewall.png
>-share/bzflag/blue_bolt.png
>-share/bzflag/blue_laser.png
>-share/bzflag/blue_super_bolt.png
>-share/bzflag/blue_tank.png
>-share/bzflag/boom.wav
>-share/bzflag/boxwall.png
>-share/bzflag/burrow.wav
>-share/bzflag/caution.png
>-share/bzflag/clouds.png
>-share/bzflag/explode1.png
>-share/bzflag/explosion.wav
>-share/bzflag/fire.wav
>-share/bzflag/fixedbr.png
>-share/bzflag/fixedmr.png
>-share/bzflag/flag.png
>-share/bzflag/flag_alert.wav
>-share/bzflag/flag_drop.wav
>-share/bzflag/flag_grab.wav
>-share/bzflag/flag_lost.wav
>-share/bzflag/flag_won.wav
>-share/bzflag/green_basetop.png
>-share/bzflag/green_basewall.png
>-share/bzflag/green_bolt.png
>-share/bzflag/green_laser.png
>-share/bzflag/green_super_bolt.png
>-share/bzflag/green_tank.png
>-share/bzflag/helvbi.png
>-share/bzflag/helvbr.png
>-share/bzflag/hunt.wav
>-share/bzflag/hunt_select.wav
>-share/bzflag/hunter_tank.png
>-share/bzflag/jump.wav
>-share/bzflag/killteam.wav
>-share/bzflag/l10n/bzflag_cs_CZ.po
>-share/bzflag/l10n/bzflag_da.po
>-share/bzflag/l10n/bzflag_de.po
>-share/bzflag/l10n/bzflag_en_US_l33t.po
>-share/bzflag/l10n/bzflag_en_US_redneck.po
>-share/bzflag/l10n/bzflag_es.po
>-share/bzflag/l10n/bzflag_fr.po
>-share/bzflag/l10n/bzflag_it.po
>-share/bzflag/l10n/bzflag_kg.po
>-share/bzflag/l10n/bzflag_nl.po
>-share/bzflag/l10n/bzflag_pt.po
>-share/bzflag/l10n/bzflag_sv.po
>-share/bzflag/l10n/bzflag_xx.po
>-share/bzflag/l10n/ISO-639-2_values_8bits.txt
>-share/bzflag/land.wav
>-share/bzflag/laser.wav
>-share/bzflag/lock.wav
>-share/bzflag/menu_arrow.png
>-share/bzflag/message_admin.wav
>-share/bzflag/message_private.wav
>-share/bzflag/message_team.wav
>-share/bzflag/missile.png
>-share/bzflag/missile.wav
>-share/bzflag/mountain1.png
>-share/bzflag/mountain2.png
>-share/bzflag/mountain3.png
>-share/bzflag/mountain4.png
>-share/bzflag/mountain5.png
>-share/bzflag/mountain6.png
>-share/bzflag/phantom.wav
>-share/bzflag/pop.wav
>-share/bzflag/purple_basetop.png
>-share/bzflag/purple_basewall.png
>-share/bzflag/purple_bolt.png
>-share/bzflag/purple_laser.png
>-share/bzflag/purple_super_bolt.png
>-share/bzflag/purple_tank.png
>-share/bzflag/pyrwall.png
>-share/bzflag/rabbit_bolt.png
>-share/bzflag/rabbit_laser.png
>-share/bzflag/rabbit_super_bolt.png
>-share/bzflag/rabbit_tank.png
>-share/bzflag/red_basetop.png
>-share/bzflag/red_basewall.png
>-share/bzflag/red_bolt.png
>-share/bzflag/red_laser.png
>-share/bzflag/red_super_bolt.png
>-share/bzflag/red_tank.png
>-share/bzflag/ricochet.wav
>-share/bzflag/rogue_bolt.png
>-share/bzflag/rogue_laser.png
>-share/bzflag/rogue_super_bolt.png
>-share/bzflag/rogue_tank.png
>-share/bzflag/roof.png
>-share/bzflag/shock.wav
>-share/bzflag/std_ground.png
>-share/bzflag/steamroller.wav
>-share/bzflag/teamgrab.wav
>-share/bzflag/teleport.wav
>-share/bzflag/thief.png
>-share/bzflag/thief.wav
>-share/bzflag/timesbi.png
>-share/bzflag/timesbr.png
>-share/bzflag/title.png
>-share/bzflag/wall.png
>-share/bzflag/zone_ground.png
>-@dirrm share/bzflag/l10n
>-@dirrm share/bzflag
>+%%DATADIR%%/blue_basetop.png
>+%%DATADIR%%/blue_basewall.png
>+%%DATADIR%%/blue_bolt.png
>+%%DATADIR%%/blue_laser.png
>+%%DATADIR%%/blue_super_bolt.png
>+%%DATADIR%%/blue_tank.png
>+%%DATADIR%%/boom.wav
>+%%DATADIR%%/bounce.wav
>+%%DATADIR%%/boxwall.png
>+%%DATADIR%%/bubble.png
>+%%DATADIR%%/burrow.wav
>+%%DATADIR%%/bzflag-256x256.png
>+%%DATADIR%%/bzflag-32x32.xpm
>+%%DATADIR%%/bzflag-48x48.png
>+%%DATADIR%%/caution.png
>+%%DATADIR%%/clouds.png
>+%%DATADIR%%/explode1.png
>+%%DATADIR%%/explode2.png
>+%%DATADIR%%/explosion.wav
>+%%DATADIR%%/fire.wav
>+%%DATADIR%%/flag.png
>+%%DATADIR%%/flag_alert.wav
>+%%DATADIR%%/flag_drop.wav
>+%%DATADIR%%/flag_grab.wav
>+%%DATADIR%%/flag_lost.wav
>+%%DATADIR%%/flag_won.wav
>+%%DATADIR%%/flap.wav
>+%%DATADIR%%/fonts/LuxiMono_12.fmt
>+%%DATADIR%%/fonts/LuxiMono_12.png
>+%%DATADIR%%/fonts/LuxiMono_16.fmt
>+%%DATADIR%%/fonts/LuxiMono_16.png
>+%%DATADIR%%/fonts/LuxiMono_32.fmt
>+%%DATADIR%%/fonts/LuxiMono_32.png
>+%%DATADIR%%/fonts/LuxiMono_6.fmt
>+%%DATADIR%%/fonts/LuxiMono_6.png
>+%%DATADIR%%/fonts/LuxiMono_8.fmt
>+%%DATADIR%%/fonts/LuxiMono_8.png
>+%%DATADIR%%/fonts/ProFont_12.fmt
>+%%DATADIR%%/fonts/ProFont_12.png
>+%%DATADIR%%/fonts/ProFont_16.fmt
>+%%DATADIR%%/fonts/ProFont_16.png
>+%%DATADIR%%/fonts/ProFont_6.fmt
>+%%DATADIR%%/fonts/ProFont_6.png
>+%%DATADIR%%/fonts/ProFont_8.fmt
>+%%DATADIR%%/fonts/ProFont_8.png
>+%%DATADIR%%/fonts/TogaSansBold_12.fmt
>+%%DATADIR%%/fonts/TogaSansBold_12.png
>+%%DATADIR%%/fonts/TogaSansBold_16.fmt
>+%%DATADIR%%/fonts/TogaSansBold_16.png
>+%%DATADIR%%/fonts/TogaSansBold_32.fmt
>+%%DATADIR%%/fonts/TogaSansBold_32.png
>+%%DATADIR%%/fonts/TogaSansBold_6.fmt
>+%%DATADIR%%/fonts/TogaSansBold_6.png
>+%%DATADIR%%/fonts/TogaSansBold_8.fmt
>+%%DATADIR%%/fonts/TogaSansBold_8.png
>+%%DATADIR%%/fonts/TogaSerifBold_12.fmt
>+%%DATADIR%%/fonts/TogaSerifBold_12.png
>+%%DATADIR%%/fonts/TogaSerifBold_16.fmt
>+%%DATADIR%%/fonts/TogaSerifBold_16.png
>+%%DATADIR%%/fonts/TogaSerifBold_32.fmt
>+%%DATADIR%%/fonts/TogaSerifBold_32.png
>+%%DATADIR%%/fonts/VeraMonoBold_12.fmt
>+%%DATADIR%%/fonts/VeraMonoBold_12.png
>+%%DATADIR%%/fonts/VeraMonoBold_16.fmt
>+%%DATADIR%%/fonts/VeraMonoBold_16.png
>+%%DATADIR%%/fonts/VeraMonoBold_6.fmt
>+%%DATADIR%%/fonts/VeraMonoBold_6.png
>+%%DATADIR%%/fonts/VeraMonoBold_8.fmt
>+%%DATADIR%%/fonts/VeraMonoBold_8.png
>+%%DATADIR%%/fonts/readme
>+%%DATADIR%%/frog.png
>+%%DATADIR%%/green_basetop.png
>+%%DATADIR%%/green_basewall.png
>+%%DATADIR%%/green_bolt.png
>+%%DATADIR%%/green_laser.png
>+%%DATADIR%%/green_super_bolt.png
>+%%DATADIR%%/green_tank.png
>+%%DATADIR%%/hunt.wav
>+%%DATADIR%%/hunt_select.wav
>+%%DATADIR%%/hunter_tank.png
>+%%DATADIR%%/jump.wav
>+%%DATADIR%%/jumpjets.png
>+%%DATADIR%%/killteam.wav
>+%%DATADIR%%/l10n/ISO-639-2_values_8bits.txt
>+%%DATADIR%%/l10n/bzflag_cs_CZ.po
>+%%DATADIR%%/l10n/bzflag_da.po
>+%%DATADIR%%/l10n/bzflag_de.po
>+%%DATADIR%%/l10n/bzflag_en_US_l33t.po
>+%%DATADIR%%/l10n/bzflag_en_US_redneck.po
>+%%DATADIR%%/l10n/bzflag_es.po
>+%%DATADIR%%/l10n/bzflag_fr.po
>+%%DATADIR%%/l10n/bzflag_it.po
>+%%DATADIR%%/l10n/bzflag_kg.po
>+%%DATADIR%%/l10n/bzflag_lt.po
>+%%DATADIR%%/l10n/bzflag_nl.po
>+%%DATADIR%%/l10n/bzflag_pt.po
>+%%DATADIR%%/l10n/bzflag_sv.po
>+%%DATADIR%%/l10n/bzflag_xx.po
>+%%DATADIR%%/land.wav
>+%%DATADIR%%/laser.wav
>+%%DATADIR%%/lock.wav
>+%%DATADIR%%/menu_arrow.png
>+%%DATADIR%%/mesh.png
>+%%DATADIR%%/message_admin.wav
>+%%DATADIR%%/message_private.wav
>+%%DATADIR%%/message_team.wav
>+%%DATADIR%%/missile.png
>+%%DATADIR%%/missile.wav
>+%%DATADIR%%/moon.png
>+%%DATADIR%%/mountain1.png
>+%%DATADIR%%/mountain2.png
>+%%DATADIR%%/mountain3.png
>+%%DATADIR%%/phantom.wav
>+%%DATADIR%%/pop.wav
>+%%DATADIR%%/puddle.png
>+%%DATADIR%%/purple_basetop.png
>+%%DATADIR%%/purple_basewall.png
>+%%DATADIR%%/purple_bolt.png
>+%%DATADIR%%/purple_laser.png
>+%%DATADIR%%/purple_super_bolt.png
>+%%DATADIR%%/purple_tank.png
>+%%DATADIR%%/pyrwall.png
>+%%DATADIR%%/rabbit_bolt.png
>+%%DATADIR%%/rabbit_laser.png
>+%%DATADIR%%/rabbit_super_bolt.png
>+%%DATADIR%%/rabbit_tank.png
>+%%DATADIR%%/radar.png
>+%%DATADIR%%/raindrop.png
>+%%DATADIR%%/red_basetop.png
>+%%DATADIR%%/red_basewall.png
>+%%DATADIR%%/red_bolt.png
>+%%DATADIR%%/red_laser.png
>+%%DATADIR%%/red_super_bolt.png
>+%%DATADIR%%/red_tank.png
>+%%DATADIR%%/ricochet.wav
>+%%DATADIR%%/rogue_bolt.png
>+%%DATADIR%%/rogue_laser.png
>+%%DATADIR%%/rogue_super_bolt.png
>+%%DATADIR%%/rogue_tank.png
>+%%DATADIR%%/roof.png
>+%%DATADIR%%/shock.wav
>+%%DATADIR%%/snowflake.png
>+%%DATADIR%%/std_ground.png
>+%%DATADIR%%/steamroller.wav
>+%%DATADIR%%/teamgrab.wav
>+%%DATADIR%%/telelink.png
>+%%DATADIR%%/teleport.wav
>+%%DATADIR%%/tetrawall.png
>+%%DATADIR%%/thief.png
>+%%DATADIR%%/thief.wav
>+%%DATADIR%%/title.png
>+%%DATADIR%%/wall.png
>+%%DATADIR%%/water.png
>+%%DATADIR%%/zone_ground.png
>+@dirrm %%DATADIR%%/fonts
>+@dirrm %%DATADIR%%/l10n
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 76454: 50145