Use pkgsrc libtool and work around the need for linking a static library

twice in particular order.

Closes PR pkg/21739 by Jeremy C. Reed.

4 files changed, 36 insertions, 2 deletions

diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 46ffd375ea7..5079b261def 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/31 20:11:20 salo Exp $
 #
 
 DISTNAME=	xscorch-0.1.15
@@ -11,8 +11,11 @@ HOMEPAGE=	http://chaos2.org/xscorch/
 COMMENT=	Multiplayer tank shoot-em-up
 
 USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
 CONFIGURE_ARGS+=	--without-gnome
 
 .include "../../audio/libmikmod/buildlink2.mk"
diff --git a/games/xscorch/distinfo b/games/xscorch/distinfo
index 2f512c2395d..b9741c3932e 100644
--- a/games/xscorch/distinfo
+++ b/games/xscorch/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/08/31 13:33:02 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/05/31 20:11:20 salo Exp $
 
 SHA1 (xscorch-0.1.15.tar.gz) = 1c919677bb869f40a1071d7484a1476d2c4c28d0
 Size (xscorch-0.1.15.tar.gz) = 508528 bytes
 SHA1 (patch-aa) = d30e33fcf5ccf8a8207524251a16b3912f6a0721
 SHA1 (patch-ab) = 912293a5e3370c51f0a2063062659855669759cd
+SHA1 (patch-ac) = 812b75dda107434dd0ea38fd141560b22e8b368e
+SHA1 (patch-ad) = 88c199323ee9f405c8b825d55fec1d656dcb6903
diff --git a/games/xscorch/patches/patch-ac b/games/xscorch/patches/patch-ac
new file mode 100644
index 00000000000..c7ff2c1d696
--- /dev/null
+++ b/games/xscorch/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2003/05/31 20:11:21 salo Exp $
+
+--- sgame/Makefile.in.orig	2002-06-18 04:33:53.000000000 +0200
++++ sgame/Makefile.in	2003-05-31 20:53:01.000000000 +0200
+@@ -208,6 +208,7 @@
+ 	-rm -f libscorch_game.a
+ 	$(AR) cru libscorch_game.a $(libscorch_game_a_OBJECTS) $(libscorch_game_a_LIBADD)
+ 	$(RANLIB) libscorch_game.a
++	-ln -s libscorch_game.a libscorch_game_dup.a
+ 
+ tags: TAGS
+ 
diff --git a/games/xscorch/patches/patch-ad b/games/xscorch/patches/patch-ad
new file mode 100644
index 00000000000..afe0e14e0dc
--- /dev/null
+++ b/games/xscorch/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2003/05/31 20:11:21 salo 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 @@
+ 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_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