[pkgsrc/trunk]: pkgsrc/games/xfrisk DESTDIR support

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68d22ee0b759
branches:  trunk
changeset: 559534:68d22ee0b759
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sat May 23 15:14:21 2009 +0000

description:
DESTDIR support

diffstat:

 games/xfrisk/Makefile         |   4 ++-
 games/xfrisk/distinfo         |   4 +-
 games/xfrisk/patches/patch-aa |  57 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 59 insertions(+), 6 deletions(-)

diffs (102 lines):

diff -r bc4954d61d38 -r 68d22ee0b759 games/xfrisk/Makefile
--- a/games/xfrisk/Makefile     Sat May 23 15:03:10 2009 +0000
+++ b/games/xfrisk/Makefile     Sat May 23 15:14:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/05/23 15:02:42 dholland Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/23 15:14:21 dholland Exp $
 #
 
 DISTNAME=      xfrisk-1.2
@@ -14,6 +14,8 @@
 #LICENSE=      gnu-gpl-v2
 LICENSE+=      generic-nonlicense
 
+PKG_DESTDIR_SUPPORT=    user-destdir
+
 WRKSRC=                ${WRKDIR}/XFrisk
 USE_TOOLS+=    gmake
 
diff -r bc4954d61d38 -r 68d22ee0b759 games/xfrisk/distinfo
--- a/games/xfrisk/distinfo     Sat May 23 15:03:10 2009 +0000
+++ b/games/xfrisk/distinfo     Sat May 23 15:14:21 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/05/23 15:02:42 dholland Exp $
+$NetBSD: distinfo,v 1.7 2009/05/23 15:14:21 dholland Exp $
 
 SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
 RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a
 Size (xfrisk-1.2.tar.gz) = 228943 bytes
-SHA1 (patch-aa) = 6b8ddeadccf686e4e380ed07f6ad8559e0d6bce7
+SHA1 (patch-aa) = bfaca880c2d88125628d0b724638eb54e27bf96d
 SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1
 SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f
 SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd
diff -r bc4954d61d38 -r 68d22ee0b759 games/xfrisk/patches/patch-aa
--- a/games/xfrisk/patches/patch-aa     Sat May 23 15:03:10 2009 +0000
+++ b/games/xfrisk/patches/patch-aa     Sat May 23 15:14:21 2009 +0000
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2007/11/20 18:44:14 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
 
---- Makefile.orig      2003-09-30 10:18:48.000000000 +0200
-+++ Makefile   2003-09-30 10:20:04.000000000 +0200
+- take build configuration from inherited pkgsrc variables
+- install under $(DESTDIR)
+
+--- Makefile.orig      2000-01-23 14:01:55.000000000 -0500
++++ Makefile   2009-05-23 11:08:33.000000000 -0400
 @@ -55,9 +55,9 @@
  ####################
  # C compiler options
@@ -53,3 +56,51 @@
  
  # On some systems -DNARROWPROTO is needed for working Xaw scrollbars
  # This includes FreeBSD 3.x and recent Linux
+@@ -208,16 +207,16 @@
+       $(RANLIB) $@
+ 
+ install: all
+-      -(umask 022; mkdir -p -m755 $(LIBDIR) $(BINDIR) $(APPLOADDIR))
+-      $(INSTALL_DATA) $(MAP) $(LIBDIR)
+-      $(INSTALL_DATA) $(COUNTRY) $(LIBDIR)
+-      $(INSTALL_DATA) $(HELP) $(LIBDIR)
+-      $(INSTALL_BIN) risk $(BINDIR)
+-      $(INSTALL_BIN) xfrisk $(BINDIR)
+-      $(INSTALL_BIN) friskserver $(BINDIR)
+-      $(INSTALL_BIN) aiDummy $(BINDIR)
+-      $(INSTALL_BIN) aiConway $(BINDIR)
+-      $(INSTALL_BIN) aiColson $(BINDIR)
++      -(umask 022; mkdir -p -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR))
++      $(INSTALL_DATA) $(MAP) $(DESTDIR)$(LIBDIR)
++      $(INSTALL_DATA) $(COUNTRY) $(DESTDIR)$(LIBDIR)
++      $(INSTALL_DATA) $(HELP) $(DESTDIR)$(LIBDIR)
++      $(INSTALL_BIN) risk $(DESTDIR)$(BINDIR)
++      $(INSTALL_BIN) xfrisk $(DESTDIR)$(BINDIR)
++      $(INSTALL_BIN) friskserver $(DESTDIR)$(BINDIR)
++      $(INSTALL_BIN) aiDummy $(DESTDIR)$(BINDIR)
++      $(INSTALL_BIN) aiConway $(DESTDIR)$(BINDIR)
++      $(INSTALL_BIN) aiColson $(DESTDIR)$(BINDIR)
+ 
+ 
+ # Other targets
+@@ -225,13 +224,13 @@
+       ./buildmap World.ppm World.risk Countries.risk
+ 
+ uninstall:
+-      rm -rf $(LIBDIR)
+-      rm -f  $(BINDIR)/risk
+-      rm -f  $(BINDIR)/xfrisk
+-      rm -f  $(BINDIR)/friskserver
+-      rm -f  $(BINDIR)/aiDummy
+-      rm -f  $(BINDIR)/aiConway
+-      rm -f  $(BINDIR)/aiColson
++      rm -rf $(DESTDIR)$(LIBDIR)
++      rm -f  $(DESTDIR)$(BINDIR)/risk
++      rm -f  $(DESTDIR)$(BINDIR)/xfrisk
++      rm -f  $(DESTDIR)$(BINDIR)/friskserver
++      rm -f  $(DESTDIR)$(BINDIR)/aiDummy
++      rm -f  $(DESTDIR)$(BINDIR)/aiConway
++      rm -f  $(DESTDIR)$(BINDIR)/aiColson
+ 
+ types.h: findtypes
+       ./findtypes