DESTDIR support.

XXX still doesn't pass the world-writeable file check

4 files changed, 26 insertions, 20 deletions

diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index dbb7ae6107d..fcdf36e4bec 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/23 16:02:39 joerg Exp $
 #
 
 DISTNAME=	Maelstrom-3.0.5
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.devolution.com/~slouken/Maelstrom/
 COMMENT=	High resolution version of Asteroids (SDL version)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		maelstrom-x11-[0-9]* maelstrom-[0-9]*
 
 GNU_CONFIGURE=		YES
@@ -19,10 +21,10 @@ USE_LANGUAGES=		c c++
 MAKE_ENV+=		CP=${CP:Q}
 
 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
+	${RM} ${DESTDIR}${PREFIX}/share/doc/Maelstrom/Docs/Makefile \
+		${DESTDIR}${PREFIX}/share/doc/Maelstrom/Docs/Makefile.in \
+		${DESTDIR}${PREFIX}/share/Maelstrom/Images/Makefile \
+		${DESTDIR}${PREFIX}/share/Maelstrom/Images/Makefile.in
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
diff --git a/games/maelstrom-sdl/distinfo b/games/maelstrom-sdl/distinfo
index 7dd569e9b02..a62a88cd34e 100644
--- a/games/maelstrom-sdl/distinfo
+++ b/games/maelstrom-sdl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2008/07/27 22:47:43 dholland Exp $
+$NetBSD: distinfo,v 1.7 2010/03/23 16:02:39 joerg Exp $
 
 SHA1 (Maelstrom-3.0.5.tar.gz) = 3731cc0ea73138539c7b12bf0b297d68be96cbab
 RMD160 (Maelstrom-3.0.5.tar.gz) = 1c0dbf3d588025ce18fced4733e638670e0c5de0
 Size (Maelstrom-3.0.5.tar.gz) = 977191 bytes
-SHA1 (patch-aa) = ecc8933ab457e84fd8ab5710014d9c2934e61fa3
-SHA1 (patch-ab) = 0cddfbde7c1420c77dc2f96a543215e9a314cfee
+SHA1 (patch-aa) = d886cc680968b6ee22abbbf78775928d7318862c
+SHA1 (patch-ab) = 54abac77b1d6afe82bf8bfb3a4288d32091039dc
 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 ca78aca1c10..d52e7c5b48f 100644
--- a/games/maelstrom-sdl/patches/patch-aa
+++ b/games/maelstrom-sdl/patches/patch-aa
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2004/03/07 05:59:17 snj Exp $
+$NetBSD: patch-aa,v 1.3 2010/03/23 16:02:39 joerg Exp $
 
---- 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
+--- Makefile.am.orig	2001-07-23 03:45:05.000000000 +0000
++++ Makefile.am
+@@ -65,11 +65,12 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
+ 
  # Special install rule for the game
  install:
- 	make install_gamedata target=@GAME_INSTALLDIR@
-+	make install_gamedocs target=$(prefix)/share/doc/Maelstrom
+-	make install_gamedata target=@GAME_INSTALLDIR@
++	make install_gamedata target=${DESTDIR}@GAME_INSTALLDIR@
++	make install_gamedocs target=${DESTDIR}$(prefix)/share/doc/Maelstrom
  
  install_gamedata:
  	sh mkinstalldirs $(target)/
diff --git a/games/maelstrom-sdl/patches/patch-ab b/games/maelstrom-sdl/patches/patch-ab
index 6a1b3dba6ce..d82b7f350a8 100644
--- a/games/maelstrom-sdl/patches/patch-ab
+++ b/games/maelstrom-sdl/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2004/03/07 05:59:17 snj Exp $
+$NetBSD: patch-ab,v 1.3 2010/03/23 16:02:39 joerg Exp $
 
---- 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
+--- Makefile.in.orig	2001-07-23 03:56:05.000000000 +0000
++++ Makefile.in
+@@ -432,11 +432,12 @@ maintainer-clean-generic clean mostlycle
+ 
  # Special install rule for the game
  install:
- 	make install_gamedata target=@GAME_INSTALLDIR@
-+	make install_gamedocs target=$(prefix)/share/doc/Maelstrom
+-	make install_gamedata target=@GAME_INSTALLDIR@
++	make install_gamedata target=${DESTDIR}@GAME_INSTALLDIR@
++	make install_gamedocs target=${DESTDIR}$(prefix)/share/doc/Maelstrom
  
  install_gamedata:
  	sh mkinstalldirs $(target)/