user-destdir support

7 files changed, 46 insertions, 15 deletions

diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index 5d9f867903f..2652afe62f1 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/06/30 00:07:16 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/08 17:17:48 joerg Exp $
 #
 
 DISTNAME=	xgospel-1.12d
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gailly.net/go.html
 COMMENT=	X11 based IGS client for online "go" playing
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		yes
diff --git a/games/xgospel/distinfo b/games/xgospel/distinfo
index c4771b37a2b..a8ca4474067 100644
--- a/games/xgospel/distinfo
+++ b/games/xgospel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/06/11 11:45:53 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/07/08 17:17:48 joerg Exp $
 
 SHA1 (xgospel-1.12d.tar.gz) = 9d873603b745b1e6046c1407a72e6d6ea474ef37
 RMD160 (xgospel-1.12d.tar.gz) = 20e55639ae2ec365ad3698f7709e2bd386380acc
 Size (xgospel-1.12d.tar.gz) = 699374 bytes
-SHA1 (patch-aa) = 3134905ebee6cbe0114e9fad04d8f885cf145fe0
+SHA1 (patch-aa) = 1fccd8f17cc77e139e3184ff45e3aa28e97f0ed7
 SHA1 (patch-ab) = 3377d5472486579620f091f69cdf68d47bff4064
 SHA1 (patch-ac) = b0a2c73933424f4b480fa7518f1c518f44fcc17b
 SHA1 (patch-ad) = a9380b25aac5f4f15eada4693956fc7f511d7457
diff --git a/games/xgospel/patches/patch-aa b/games/xgospel/patches/patch-aa
index a4491546354..15360f77a8e 100644
--- a/games/xgospel/patches/patch-aa
+++ b/games/xgospel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/06/11 11:45:53 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/08 17:17:48 joerg Exp $
 
 --- Makefile.in.orig	1998-05-08 15:31:05.000000000 +0200
 +++ Makefile.in
@@ -11,12 +11,18 @@ $NetBSD: patch-aa,v 1.2 2005/06/11 11:45:53 wiz Exp $
  
  CC   = @CC@
  LEX  = @LEX@
-@@ -163,7 +163,7 @@ dummylibs:
+@@ -163,12 +163,12 @@ dummylibs:
  ###############################################################################
  
  installdirs:
 -	$(INSTALL_PROGRAM) -d $(bindir)
-+	$(BSD_INSTALL_PROGRAM_DIR) -d $(bindir)
++	$(BSD_INSTALL_PROGRAM_DIR) -d ${DESTDIR}$(bindir)
  
  install: all installdirs
  	case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \
+ 	for p in $(INSTALL_PROGS); do \
+-	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p | sed 's,.*/,,; $(transform)'`; \
++	  $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p | sed 's,.*/,,; $(transform)'`; \
+ 	done
+ 
+ uninstall:
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 7a37559aa69..60dc26089bf 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/07/22 21:59:00 tonio Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/08 17:15:08 joerg Exp $
 #
 
 DISTNAME=	xmahjongg-3.7
@@ -10,6 +10,8 @@ MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.lcdf.org/~eddietwo/xmahjongg/
 COMMENT=	The Chinese game of Mah Jongg for X11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index 7449a3fc44e..4e11d0c4f57 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/02 17:13:01 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/08 17:19:05 joerg Exp $
 #
 
 DISTNAME=	xroads-v0.5
@@ -11,6 +11,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# http://freshmeat.net/homepage/898367442/
 COMMENT=	Overhead view maze-based shoot 'em up game
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin
+
 WRKSRC=		${WRKDIR}/xroads-v0.5
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/games/xroads/distinfo b/games/xroads/distinfo
index 635fa5e7256..fe30138c023 100644
--- a/games/xroads/distinfo
+++ b/games/xroads/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/08/02 19:24:55 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2009/07/08 17:19:05 joerg Exp $
 
 SHA1 (xroads-v0.5.tar.gz) = 559f916eda55ba4700c2cea6fcb42d1b1a47fa06
 RMD160 (xroads-v0.5.tar.gz) = c0399b391d2113d93c08c25ad6370273791261b7
 Size (xroads-v0.5.tar.gz) = 48641 bytes
-SHA1 (patch-aa) = 4978b1b718b920871d06acff54895da60642c949
+SHA1 (patch-aa) = 4484ea71864b6db650faddf793b850ab251f34ad
 SHA1 (patch-ab) = f22b139e84c4e2d4d9d190d818d0ce6aba816a23
 SHA1 (patch-ac) = 19c91236e36cced0c26f527fdc99a565dfdb245f
 SHA1 (patch-ad) = eb76c3ee57d8b18f70e7f8bcd41d96d5e1dd4dad
diff --git a/games/xroads/patches/patch-aa b/games/xroads/patches/patch-aa
index 832aeafd581..b50d3e3713b 100644
--- a/games/xroads/patches/patch-aa
+++ b/games/xroads/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/09/26 00:46:05 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/08 17:19:05 joerg Exp $
 
---- Makefile.orig	Wed Jun 30 20:25:02 1999
+--- Makefile.orig	1999-06-30 20:25:02.000000000 +0200
 +++ Makefile
-@@ -5,8 +5,8 @@
+@@ -5,8 +5,8 @@ VERSION = v0.5
  # it's data, and BINPATH is where it puts the executable
  ###########################################################################
  
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.2 2000/09/26 00:46:05 hubertf Exp $
  # I imagine you would use this BINPATH for Solaris:
  #BINPATH = /usr/openwin/bin/
  
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ BINPATH = /usr/X11R6/bin/
  # optimizations. Check the manual for your compiler.
  ###########################################################################
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2000/09/26 00:46:05 hubertf Exp $
  #CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\"
  
  ###########################################################################
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ CFLAGS = -fomit-frame-pointer -O2 -Wall 
  ###########################################################################
  
  ### Linux machines use this line:
@@ -31,3 +31,20 @@ $NetBSD: patch-aa,v 1.2 2000/09/26 00:46:05 hubertf Exp $
  
  ### I'm told this line works fine on Solaris 2.5.1 with X11R5:
  #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm
+@@ -73,11 +73,11 @@ all: $(OBJECTS)
+ 	$(CC) $(FLAGS) $(LINK) -o xroads $(OBJECTS)
+ 
+ install: all
+-	rm -fr $(DATAPATH)
+-	mkdir $(DATAPATH)
+-	cp -f *.xrm $(DATAPATH)
+-	cp -f README $(DATAPATH)
+-	cp -f xroads $(BINPATH)
++	rm -fr ${DESTDIR}$(DATAPATH)
++	mkdir ${DESTDIR}$(DATAPATH)
++	${BSD_INSTALL_DATA} *.xrm ${DESTDIR}$(DATAPATH)
++	${BSD_INSTALL_DATA} README ${DESTDIR}$(DATAPATH)
++	${BSD_INSTALL_PROGRAM} xroads ${DESTDIR}$(BINPATH)
+ 
+ uninstall:
+ 	rm -fr $(DATAPATH)