Attachment 39205 Details for Bug 61868 – file.diff

[patch] file.diff

file.diff (text/plain), 5.53 KB, created by Chuck Swiger on 2004-01-25 05:50:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chuck Swiger

Created: 2004-01-25 05:50:14 UTC

Size: 5.53 KB

patch

obsolete

>diff -duwr /usr/ports/games/bzflag/Makefile bzflag/Makefile
>--- /usr/ports/games/bzflag/Makefile	Thu Dec 11 15:20:13 2003
>+++ bzflag/Makefile	Sun Jan 25 00:39:42 2004
>@@ -6,16 +6,14 @@
> #
> 
> PORTNAME=	bzflag
>-PORTVERSION=	1.10.0
>+PORTVERSION=	1.10.4
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}-${PORTVERSION:R}.20031209
>+DISTNAME=	${PORTNAME}-${PORTVERSION}.20040125
> 
> MAINTAINER=	chuck@pkix.net
> COMMENT=	A multiplayer 3D tank battle game
>-
>-WRKSRC=		${WRKDIR}/${PORTNAME}-1.9.10.20031209
> 
> USE_GL=		yes
> USE_REINPLACE=	yes
>diff -duwr /usr/ports/games/bzflag/distinfo bzflag/distinfo
>--- /usr/ports/games/bzflag/distinfo	Thu Dec 11 09:23:16 2003
>+++ bzflag/distinfo	Sun Jan 25 00:39:43 2004
>@@ -1 +1 @@
>-MD5 (bzflag-1.10.20031209.tar.gz) = 2dd502bfdee96b9d5055ea3125a4b95a
>+MD5 (bzflag-1.10.4.20040125.tar.gz) = 259074f786c907f95d1d52e3831d6bc5
>diff -duwr /usr/ports/games/bzflag/files/patch-XWindow.h bzflag/files/patch-XWindow.h
>--- /usr/ports/games/bzflag/files/patch-XWindow.h	Sun May  4 15:05:34 2003
>+++ bzflag/files/patch-XWindow.h	Sun Jan 25 00:39:42 2004
>@@ -1,6 +1,6 @@
>---- src/platform/XWindow.h.bak	Tue Jun  4 02:39:32 2002
>-+++ src/platform/XWindow.h	Sun May  4 14:23:23 2003
>-@@ -35,9 +35,14 @@
>+--- src/platform/XWindow.h_orig	Sat Jan 24 23:22:56 2004
>++++ src/platform/XWindow.h	Sat Jan 24 23:23:25 2004
>+@@ -35,7 +35,12 @@
>  extern "C" {
>  #endif
>  #ifdef __FreeBSD__
>@@ -12,8 +12,5 @@
> +#  include <libusbhid.h>
> +# endif
>  #else
>--#include <usb.h>
>-+# include <usb.h>
>+ #include <usb.h>
>  #endif
>- #include <dev/usb/usb.h>
>- #include <dev/usb/usbhid.h>
>diff -duwr /usr/ports/games/bzflag/files/patch-configure bzflag/files/patch-configure
>--- /usr/ports/games/bzflag/files/patch-configure	Thu Dec 11 09:23:16 2003
>+++ bzflag/files/patch-configure	Sun Jan 25 00:39:42 2004
>@@ -1,15 +1,15 @@
>---- configure.orig	Tue Dec  9 17:08:21 2003
>-+++ configure	Thu Dec 11 00:55:53 2003
>-@@ -2515,7 +2515,7 @@
>- fi
>- 
>- 
>--LDFLAGS=$X_LIBS
>-+LDFLAGS="$X_LIBS $LDFLAGS"
>- case $host_os in
>-   solaris*)
>-     GLIBS="-lresolv -laudio $GLIBS";
>-@@ -2724,7 +2724,7 @@
>+--- configure.orig	Sat Jan 24 20:15:57 2004
>++++ configure	Sun Jan 25 00:24:23 2004
>+@@ -323,7 +323,7 @@
>+ prefix=NONE
>+ program_prefix=NONE
>+ program_suffix=NONE
>+-program_transform_name=s,x,x,
>++program_transform_name=
>+ silent=
>+ site=
>+ srcdir=
>+@@ -6065,7 +6065,7 @@
>  
>  # avoid using X11 in BeOS
>  if test $host_os != beos; then
>Only in /usr/ports/games/bzflag/files: patch-src::bzadmin::CursesUI.cxx
>Only in /usr/ports/games/bzflag/files: patch-src::bzflag::Makefile.in
>diff -duwr /usr/ports/games/bzflag/pkg-plist bzflag/pkg-plist
>--- /usr/ports/games/bzflag/pkg-plist	Mon Dec 22 18:16:32 2003
>+++ bzflag/pkg-plist	Sun Jan 25 00:39:43 2004
>@@ -2,11 +2,15 @@
> bin/bzflag
> bin/bzfrelay
> bin/bzfs
>-share/bzflag/bbolt.png
>-share/bzflag/blaser.png
>+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/btbolt.png
>+share/bzflag/burrow.wav
> share/bzflag/caution.png
> share/bzflag/clouds.png
> share/bzflag/explode1.png
>@@ -20,15 +24,17 @@
> share/bzflag/flag_grab.wav
> share/bzflag/flag_lost.wav
> share/bzflag/flag_won.wav
>-share/bzflag/flage.png
>-share/bzflag/gbolt.png
>-share/bzflag/glaser.png
>-share/bzflag/ground.png
>-share/bzflag/gtbolt.png
>+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
>@@ -47,35 +53,50 @@
> share/bzflag/land.wav
> share/bzflag/laser.wav
> share/bzflag/lock.wav
>+share/bzflag/menu_arrow.png
>+share/bzflag/message_private.wav
>+share/bzflag/message_team.wav
> share/bzflag/missile.png
> share/bzflag/missile.wav
>-share/bzflag/mountain.png
>-share/bzflag/panel.png
>-share/bzflag/pbolt.png
>+share/bzflag/mountain1.png
>+share/bzflag/mountain2.png
>+share/bzflag/mountain3.png
> share/bzflag/phantom.wav
>-share/bzflag/plaser.png
> share/bzflag/pop.wav
>-share/bzflag/ptbolt.png
>+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/rbolt.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/rlaser.png
>+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/rtbolt.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/wbolt.png
>-share/bzflag/wlaser.png
>-share/bzflag/wtbolt.png
>-share/bzflag/ybolt.png
>-share/bzflag/ylaser.png
>-share/bzflag/ytbolt.png
>+share/bzflag/zone_ground.png
> @dirrm share/bzflag/l10n
> @dirrm share/bzflag

Actions: View | Diff

Attachments on bug 61868: 39205