user-destdir support

6 files changed, 37 insertions, 26 deletions

diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 5d496e418d8..9e90cccd1c3 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2009/07/08 17:07:41 joerg Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xbill.org/
 COMMENT=		Stop the dreaded Windows virus from infecting computers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		gnome-games-[0-9]*
 
 USE_LANGUAGES=		c c++
@@ -30,8 +32,8 @@ CONF_FILES_PERMS+=	${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.
 INSTALLATION_DIRS+=	${PKGMANDIR}/man6 share/examples
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/${PKGMANDIR}/man6/xbill.6
-	${INSTALL_DATA} ${WRKSRC}/scores ${PREFIX}/share/examples/xbill.scores
+	${INSTALL_MAN} ${WRKSRC}/xbill.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xbill.6
+	${INSTALL_DATA} ${WRKSRC}/scores ${DESTDIR}${PREFIX}/share/examples/xbill.scores
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/xbill/distinfo b/games/xbill/distinfo
index 986ee729e4f..da6870adf40 100644
--- a/games/xbill/distinfo
+++ b/games/xbill/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/10/23 22:57:55 rillig Exp $
+$NetBSD: distinfo,v 1.13 2009/07/08 17:07:41 joerg Exp $
 
 SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
 RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460
 Size (xbill-2.0.tgz) = 46909 bytes
-SHA1 (patch-aa) = 6dbb52be7523877ae52a5b6f8f913acc2e7d8a5d
+SHA1 (patch-aa) = c24632f4e81460b200485f2f644d68144a27a2e6
 SHA1 (patch-ab) = 13a90b12c94352e228406541db06bacab8cd4a0d
 SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
 SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c
diff --git a/games/xbill/patches/patch-aa b/games/xbill/patches/patch-aa
index 6c4ea147124..3190bfc85e9 100644
--- a/games/xbill/patches/patch-aa
+++ b/games/xbill/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2005/10/23 22:57:55 rillig Exp $
+$NetBSD: patch-aa,v 1.10 2009/07/08 17:07:41 joerg Exp $
 
---- Imakefile.orig	1997-01-23 10:38:35.000000000 -0600
+--- Imakefile.orig	1997-01-23 17:38:35.000000000 +0100
 +++ Imakefile
 @@ -1,4 +1,4 @@
 -XBILL_DIR = /var/lib/games/xbill/
@@ -45,9 +45,11 @@ $NetBSD: patch-aa,v 1.9 2005/10/23 22:57:55 rillig Exp $
  ComplexProgramTarget($(TARGET))
  
 -InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
+-InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
+-InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
 +install::
-+	mkdir -p $(XBILL_DIR)
-+	${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill $(PREFIX)/bin
++	mkdir -p ${DESTDIR}$(XBILL_DIR)
++	${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill ${DESTDIR}$(PREFIX)/bin
 +
- InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
- InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
++InstallMultiple ($(XPMS),$(XBILL_DIR)pixmaps)
++InstallMultiple ($(XBMS),$(XBILL_DIR)bitmaps)
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 3a488e9a1b0..1cf775685b3 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/08 17:11:23 joerg Exp $
 
 DISTNAME=	xboard-4.2.7
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://www.tim-mann.org/xboard.html
 COMMENT=	Graphical frontend for chess engines and servers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIGURE_ARGS+=	--enable-xpm
 CONFIGURE_ARGS+=	--enable-zippy	# interface to ICS
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
diff --git a/games/xboard/distinfo b/games/xboard/distinfo
index 5d717454621..c0022fd6ccf 100644
--- a/games/xboard/distinfo
+++ b/games/xboard/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/07/16 09:17:15 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/08 17:11:23 joerg Exp $
 
 SHA1 (xboard-4.2.7.tar.gz) = ad6bc0b25290079d744e93ea8c3dfcf349180180
 RMD160 (xboard-4.2.7.tar.gz) = bd05a47319a35f7024a1743bea622e26052f4d28
 Size (xboard-4.2.7.tar.gz) = 1318110 bytes
-SHA1 (patch-aa) = 6121ee25988317a546391a621933d9f783f38580
+SHA1 (patch-aa) = 16e5f93b20562c88bda618ae50534a9c3f5afa54
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa
index 66084c9f4d3..1935a11a3f8 100644
--- a/games/xboard/patches/patch-aa
+++ b/games/xboard/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2006/07/16 09:17:15 rillig Exp $
+$NetBSD: patch-aa,v 1.9 2009/07/08 17:11:23 joerg Exp $
 
 --- Makefile.in.orig	2003-11-28 22:12:57.000000000 +0100
-+++ Makefile.in	2006-07-16 10:56:17.000000000 +0200
++++ Makefile.in
 @@ -18,10 +18,7 @@ bindir = @bindir@
  mandir = @mandir@
  man6dir = $(mandir)/man6
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.8 2006/07/16 09:17:15 rillig Exp $
  
  CC = @CC@
  CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
-@@ -63,15 +60,14 @@ default: xboard zic2xpm
+@@ -63,18 +60,17 @@ default: xboard zic2xpm
  all: default pseudosource info FAQ html dvi ps
  
  install: installdirs default
@@ -24,16 +24,21 @@ $NetBSD: patch-aa,v 1.8 2006/07/16 09:17:15 rillig Exp $
 -	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
 -	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
 -	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-+	$(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard
-+	$(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm
-+	$(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail
-+	$(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard
-+	$(BSD_INSTALL_MAN) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
-+	$(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
- 	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
+-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
 -	-PATH=$$PATH:/sbin:/usr/sbin install-info \
 -		$(infodir)/xboard.info $(infodir)/dir
-+	$(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir
++	$(BSD_INSTALL_PROGRAM) xboard ${DESTDIR}$(bindir)/xboard
++	$(BSD_INSTALL_PROGRAM) zic2xpm ${DESTDIR}$(bindir)/zic2xpm
++	$(BSD_INSTALL_SCRIPT) cmail ${DESTDIR}$(bindir)/cmail
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard ${DESTDIR}$(bindir)/pxboard
++	$(BSD_INSTALL_MAN) $(srcdir)/xboard.man ${DESTDIR}$(man6dir)/xboard$(man6ext)
++	$(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man ${DESTDIR}$(man6dir)/zic2xpm$(man6ext)
++	$(INSTALL_DATA) xboard.info ${DESTDIR}$(infodir)/xboard.info
++	$(INSTALL_INFO) ${DESTDIR}$(infodir)/xboard.info ${DESTDIR}$(infodir)/dir
  
  installdirs: mkinstalldirs
- 	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
+-	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
++	$(srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(mandir) ${DESTDIR}$(man6dir) ${DESTDIR}$(infodir)
+ 
+ uninstall:
+ 	rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard