Use bl3, use ${CP} instead of cp.

4 files changed, 23 insertions, 21 deletions

diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index 212e49e44d6..f08a86fcb87 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/26 21:41:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/07 05:59:17 snj Exp $
 #
 
 DISTNAME=	Maelstrom-3.0.5
@@ -13,17 +13,19 @@ COMMENT=	High resolution version of Asteroids (SDL version)
 
 CONFLICTS=		maelstrom-x11-[0-9]* maelstrom-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 
+MAKE_ENV+=		CP=${CP}
+
 post-install:
 	${RM} ${PREFIX}/share/doc/Maelstrom/Docs/Makefile \
 		${PREFIX}/share/doc/Maelstrom/Docs/Makefile.in \
 		${PREFIX}/share/Maelstrom/Images/Makefile \
 		${PREFIX}/share/Maelstrom/Images/Makefile.in
 
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../net/SDL_net/buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../net/SDL_net/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-sdl/distinfo b/games/maelstrom-sdl/distinfo
index 2ea17ce203c..0f1a7be6424 100644
--- a/games/maelstrom-sdl/distinfo
+++ b/games/maelstrom-sdl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2004/02/27 00:50:23 snj Exp $
+$NetBSD: distinfo,v 1.3 2004/03/07 05:59:17 snj Exp $
 
 SHA1 (Maelstrom-3.0.5.tar.gz) = 3731cc0ea73138539c7b12bf0b297d68be96cbab
 Size (Maelstrom-3.0.5.tar.gz) = 977191 bytes
-SHA1 (patch-aa) = b411a79bd5337f52f77037898567055e99b08ba0
-SHA1 (patch-ab) = b5d5482f7c544c823c8fb900a89d7504985dbf1a
+SHA1 (patch-aa) = ecc8933ab457e84fd8ab5710014d9c2934e61fa3
+SHA1 (patch-ab) = 0cddfbde7c1420c77dc2f96a543215e9a314cfee
 SHA1 (patch-ac) = 3c2b09dab9a40b2499fd8d1ddb744084b049c4a8
 SHA1 (patch-ad) = 2d72ac28eb44cd00f8007be305bedb9f5d41e448
 SHA1 (patch-ae) = a256a45e5ac3c4d82cb3333a49e31ecf0ed318b2
diff --git a/games/maelstrom-sdl/patches/patch-aa b/games/maelstrom-sdl/patches/patch-aa
index b4ea20f2115..ca78aca1c10 100644
--- a/games/maelstrom-sdl/patches/patch-aa
+++ b/games/maelstrom-sdl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 13:21:28 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/07 05:59:17 snj Exp $
 
---- Makefile.am.orig	Mon Jul 23 05:45:05 2001
-+++ Makefile.am
-@@ -66,10 +66,11 @@
+--- Makefile.am.orig	2001-07-22 20:45:05.000000000 -0700
++++ Makefile.am	2004-03-06 21:54:35.000000000 -0800
+@@ -66,10 +66,11 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
  # Special install rule for the game
  install:
  	make install_gamedata target=@GAME_INSTALLDIR@
@@ -11,16 +11,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/11 13:21:28 wiz Exp $
  install_gamedata:
  	sh mkinstalldirs $(target)/
 -	cp -rv Images			\
-+	cp -R Images			\
++	$(CP) -R Images			\
  	       Maelstrom_Fonts		\
  	       Maelstrom_Sounds		\
  	       Maelstrom_Sprites	\
-@@ -79,7 +80,7 @@
+@@ -79,7 +80,7 @@ install_gamedata:
  
  install_gamedocs:
  	sh mkinstalldirs $(target)/
 -	cp -rv README* COPYING* Docs*	$(target)/
-+	cp -R README* COPYING* Docs*	$(target)/
++	$(CP) -R README* COPYING* Docs*	$(target)/
  
  # Rule to build tar-gzipped distribution package
  $(PACKAGE)-$(VERSION).tar.gz: dist
diff --git a/games/maelstrom-sdl/patches/patch-ab b/games/maelstrom-sdl/patches/patch-ab
index eebc124406a..6a1b3dba6ce 100644
--- a/games/maelstrom-sdl/patches/patch-ab
+++ b/games/maelstrom-sdl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/11 13:21:28 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/07 05:59:17 snj Exp $
 
---- Makefile.in.orig	Mon Jul 23 05:56:05 2001
-+++ Makefile.in
-@@ -433,10 +433,11 @@
+--- Makefile.in.orig	2001-07-22 20:56:05.000000000 -0700
++++ Makefile.in	2004-03-06 21:54:49.000000000 -0800
+@@ -433,10 +433,11 @@ maintainer-clean-generic clean mostlycle
  # Special install rule for the game
  install:
  	make install_gamedata target=@GAME_INSTALLDIR@
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/11 13:21:28 wiz Exp $
  install_gamedata:
  	sh mkinstalldirs $(target)/
 -	cp -rv Images			\
-+	cp -R Images			\
++	$(CP) -R Images			\
  	       Maelstrom_Fonts		\
  	       Maelstrom_Sounds		\
  	       Maelstrom_Sprites	\
-@@ -446,7 +447,7 @@
+@@ -446,7 +447,7 @@ install_gamedata:
  
  install_gamedocs:
  	sh mkinstalldirs $(target)/
 -	cp -rv README* COPYING* Docs*	$(target)/
-+	cp -R README* COPYING* Docs*	$(target)/
++	$(CP) -R README* COPYING* Docs*	$(target)/
  
  # Rule to build tar-gzipped distribution package
  $(PACKAGE)-$(VERSION).tar.gz: dist