Use bl3, update HOMEPAGE and MASTER_SITES, update to 0.1.16. Changes

include tons of bugfixes and miscellaneous changes.  See the included
ChangeLog for details.

4 files changed, 28 insertions, 26 deletions

diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 88a18586788..75cacd7ed4e 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:40 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.10 2004/03/07 23:26:15 snj Exp $
 
-DISTNAME=	xscorch-0.1.15
-PKGREVISION=	2
+DISTNAME=	xscorch-0.1.16
 CATEGORIES=	games
-MASTER_SITES=	http://chaos2.org/xscorch/
+MASTER_SITES=	http://www.xscorch.org/releases/
 
 MAINTAINER=	zuntum@NetBSD.org
-HOMEPAGE=	http://chaos2.org/xscorch/
+HOMEPAGE=	http://www.xscorch.org/
 COMMENT=	Multiplayer tank shoot-em-up
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--without-gnome
 
-.include "../../audio/libmikmod/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../audio/libmikmod/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscorch/PLIST b/games/xscorch/PLIST
index 0cdc0006dc3..ce4f54f37ca 100644
--- a/games/xscorch/PLIST
+++ b/games/xscorch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/07 23:26:15 snj Exp $
 bin/xscorch
 bin/xscorch-server
 man/man6/xscorch.6
@@ -7,6 +7,7 @@ share/xscorch/copying.txt
 share/xscorch/images/xscorch-icon.xpm
 share/xscorch/images/xscorch-logo.xpm
 share/xscorch/profiles.def
+share/xscorch/scorings.def
 share/xscorch/sounds/README
 share/xscorch/weapons.def
 share/xscorch/xscorch.txt
diff --git a/games/xscorch/distinfo b/games/xscorch/distinfo
index b9741c3932e..7ba1ceab760 100644
--- a/games/xscorch/distinfo
+++ b/games/xscorch/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/05/31 20:11:20 salo Exp $
+$NetBSD: distinfo,v 1.5 2004/03/07 23:26:15 snj Exp $
 
-SHA1 (xscorch-0.1.15.tar.gz) = 1c919677bb869f40a1071d7484a1476d2c4c28d0
-Size (xscorch-0.1.15.tar.gz) = 508528 bytes
+SHA1 (xscorch-0.1.16.tar.gz) = e3f712f110e7283ef67890da4ed4cee4e1fbcd7b
+Size (xscorch-0.1.16.tar.gz) = 814613 bytes
 SHA1 (patch-aa) = d30e33fcf5ccf8a8207524251a16b3912f6a0721
 SHA1 (patch-ab) = 912293a5e3370c51f0a2063062659855669759cd
 SHA1 (patch-ac) = 812b75dda107434dd0ea38fd141560b22e8b368e
-SHA1 (patch-ad) = 88c199323ee9f405c8b825d55fec1d656dcb6903
+SHA1 (patch-ad) = 9526c5cf549c431e189ff8e2d6ef275ce3045e65
diff --git a/games/xscorch/patches/patch-ad b/games/xscorch/patches/patch-ad
index afe0e14e0dc..09a4872f3e7 100644
--- a/games/xscorch/patches/patch-ad
+++ b/games/xscorch/patches/patch-ad
@@ -1,17 +1,20 @@
-$NetBSD: patch-ad,v 1.1 2003/05/31 20:11:21 salo Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/07 23:26:15 snj Exp $
 
---- Makefile.in.orig	2002-06-18 04:33:52.000000000 +0200
-+++ Makefile.in	2003-05-31 20:58:40.000000000 +0200
-@@ -116,10 +116,10 @@
+--- Makefile.in.orig	2004-01-28 22:33:50.000000000 -0800
++++ Makefile.in	2004-03-07 15:15:13.000000000 -0800
+@@ -152,13 +152,12 @@ MAINTAINERCLEANFILES = *.orig
  bin_PROGRAMS = $(GTK_PROGRAM) $(NETWORK_PROGRAM)
  
- xscorch_SOURCES = xscorch.c
--xscorch_LDADD = $(GTK_LIBS) $(LIBMIKMOD_LIBS) sgame/libscorch_game.a sgtk/libscorch_gtk.a sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a $(MIKMOD_LD_ADD) $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
-+xscorch_LDADD = $(GTK_LIBS) $(LIBMIKMOD_LIBS) sgame/libscorch_game_dup.a sgtk/libscorch_gtk.a sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a $(MIKMOD_LD_ADD) $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
+ xscorch_SOURCES =  	xscorch.c
+-
+-xscorch_LDADD =  	-lm 	$(GTK_LIBS) 	$(LIBMIKMOD_LIBS) 	sgame/libscorch_game.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
++xscorch_LDADD =  	-lm 	$(GTK_LIBS) 	$(LIBMIKMOD_LIBS) 	sgame/libscorch_game_dup.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
+ 
+ 
+ xscorch_server_SOURCES =  	xscorch.c
+ 
+-xscorch_server_LDADD =  	-lm 	$(LIBREADLINE_LIBS) 	sgame/libscorch_game.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
++xscorch_server_LDADD =  	-lm 	$(LIBREADLINE_LIBS) 	sgame/libscorch_game_dup.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
  
- xscorch_server_SOURCES = xscorch.c
--xscorch_server_LDADD = -lm $(LIBREADLINE_LIBS) sgame/libscorch_game.a sconsole/libscorch_console.a sai/libscorch_ai.a ssound/libscorch_sound_null.a $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
-+xscorch_server_LDADD = -lm $(LIBREADLINE_LIBS) sgame/libscorch_game_dup.a sconsole/libscorch_console.a sai/libscorch_ai.a ssound/libscorch_sound_null.a $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
  
  INCLUDES = -Isgame -Isgtk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4