Add DESTDIR support.

19 files changed, 78 insertions, 22 deletions

diff --git a/misc/basket/Makefile b/misc/basket/Makefile
index 071fc7b1ab2..a66c1368a86 100644
--- a/misc/basket/Makefile
+++ b/misc/basket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/01/18 05:08:33 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=		basket-1.0.2
 PKGREVISION=		3
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://basket.kde.org/
 COMMENT=		Feature-rich note-taking KDE application
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 732f2dff5a6..076bc48685d 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=		ls
 PKGNAME=		colorls-2.2
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Ls that can use color to display file attributes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile
index 1b410185afc..0c92b6be9a6 100644
--- a/misc/cstream/Makefile
+++ b/misc/cstream/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/25 05:46:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=	cstream-2.2
 CATEGORIES=	misc
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cons.org/cracauer/cstream.html
 COMMENT=	General-purpose stream-handling tool with bandwidth limiting
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 9109605fbfe..86128b06b72 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/29 16:48:03 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=	deskbar-applet-2.22.2.1
@@ -10,6 +10,8 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://raphael.slinckx.net/deskbar/
 COMMENT=	Omnipresent, versatile search interface for the GNOME Desktop
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
diff --git a/misc/dgpsip/Makefile b/misc/dgpsip/Makefile
index f2258f690bf..41552a65290 100644
--- a/misc/dgpsip/Makefile
+++ b/misc/dgpsip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=	dgpsip-1.35
 CATEGORIES=	misc
@@ -8,6 +8,8 @@ MAINTAINER=	wsr+dgpsip@wsrcc.com
 HOMEPAGE=	http://www.wsrcc.com/wolfgang/gps/dgps-ip.html
 COMMENT=	Differential GPS over IP communication device
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 3c56e7856f7..5669facbfb6 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/12 17:56:05 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=	dpkg_1.13.25
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://packages.debian.org/dpkg
 COMMENT=	Package maintenance system for Debian
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=		po4a>=0:../../textproc/po4a
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
diff --git a/misc/p5-Locale-Maketext-Fuzzy/Makefile b/misc/p5-Locale-Maketext-Fuzzy/Makefile
index d8c57b80138..41173af76c2 100644
--- a/misc/p5-Locale-Maketext-Fuzzy/Makefile
+++ b/misc/p5-Locale-Maketext-Fuzzy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/04/23 20:23:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=		Locale-Maketext-Fuzzy-0.10
@@ -13,6 +13,7 @@ COMMENT=		Maketext from already interpolated strings
 DEPENDS+=		{perl>=5.8.0,p5-Locale-Maketext-[0-9]*}:../../misc/p5-Locale-Maketext
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Locale/Maketext/Fuzzy/.packlist
diff --git a/misc/p5-Locale-Maketext-Simple/Makefile b/misc/p5-Locale-Maketext-Simple/Makefile
index 0afd7029cdb..cded5ea97ea 100644
--- a/misc/p5-Locale-Maketext-Simple/Makefile
+++ b/misc/p5-Locale-Maketext-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/11/04 11:54:39 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=		Locale-Maketext-Simple-0.18
 PKGNAME=		p5-${DISTNAME}
@@ -10,6 +10,7 @@ HOMEPAGE=		http://search.cpan.org/~audreyt/Locale-Maketext-Simple/
 COMMENT=		Simple interface to Locale::Maketext::Lexicon
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Locale/Maketext/Simple/.packlist
diff --git a/misc/p5-Locale-Maketext/Makefile b/misc/p5-Locale-Maketext/Makefile
index 6b6e4631886..ecaeba6b3a6 100644
--- a/misc/p5-Locale-Maketext/Makefile
+++ b/misc/p5-Locale-Maketext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=		Locale-Maketext-1.10
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Locale-Maketext/
 COMMENT=		Perl framework for localization
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-I18N-LangTags>=0.30:../../misc/p5-I18N-LangTags
 
 PERL5_PACKLIST=		auto/Locale-Maketext/.packlist
diff --git a/misc/p5-Mac-Macbinary/Makefile b/misc/p5-Mac-Macbinary/Makefile
index 12d8f27610c..754391124ad 100644
--- a/misc/p5-Mac-Macbinary/Makefile
+++ b/misc/p5-Mac-Macbinary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/06/10 09:38:56 obache Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=		Mac-Macbinary-0.06
 PKGNAME=		p5-${DISTNAME}
@@ -9,6 +9,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Mac/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Perl5 module for decoding Macbinary files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/Mac/Macbinary/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/misc/p5-Msgcat/Makefile b/misc/p5-Msgcat/Makefile
index 1733bd53c33..0971160e427 100644
--- a/misc/p5-Msgcat/Makefile
+++ b/misc/p5-Msgcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/27 09:30:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=		Msgcat-1.03
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Msgcat/
 COMMENT=		Perl5 module to use the message catalog functions
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/Locale/Msgcat/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 2ecd8e0b7de..c7e8c7ee7a0 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:12 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/12 02:14:37 joerg Exp $
 
 DISTNAME=		Search-0.2
 PKGNAME=		p5-Search-0.2
@@ -10,6 +10,8 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Search/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Perl5 module to provide framework for multiple searches
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_PACKLIST=		auto/Search/Text/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index 547562a38fa..a080086daa8 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:37 joerg Exp $
 
 MODNAME=		calendar
 CATEGORIES+=		misc
 COMMENT=		PHP extension for calendar conversion support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	php-calendar-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile
index 79dbf8a6151..61207c758b3 100644
--- a/misc/php-mbstring/Makefile
+++ b/misc/php-mbstring/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:37 joerg Exp $
 
 MODNAME=		mbstring
 CATEGORIES+=		misc
 COMMENT=		PHP extension for multibyte characters support (currently, Japanese only)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	php-mbstring-[0-9]*
 
 USE_PHP_EXT_PATCHES=	yes
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index ab4b67e157c..71beb5a6bc8 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/01/04 07:49:35 obache Exp $
+# $NetBSD: Makefile,v 1.33 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=		pinfo-0.6.1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pinfo.alioth.debian.org/
 COMMENT=		Przemek's Info Viewer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
diff --git a/misc/pinfo/distinfo b/misc/pinfo/distinfo
index 5ee6e066b2b..dcb12ee5368 100644
--- a/misc/pinfo/distinfo
+++ b/misc/pinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/04/05 22:54:59 jlam Exp $
+$NetBSD: distinfo,v 1.7 2008/06/12 02:14:37 joerg Exp $
 
 SHA1 (pinfo-0.6.1.tar.gz) = f0444f4eb3bad4f10ad96c971d7bcd553b567ef4
 RMD160 (pinfo-0.6.1.tar.gz) = 85313caf3323f00720bd319dffd2593025745779
@@ -6,3 +6,4 @@ Size (pinfo-0.6.1.tar.gz) = 271015 bytes
 SHA1 (patch-aa) = e2d7d0e8ccbe5db276fb736d22682bb8f719eb98
 SHA1 (patch-ab) = f089af56a969af630e2cb886aa8fb40be055eca7
 SHA1 (patch-ac) = 7dbddcf81e9ad6ff00dadd8a93cf2c160992ce75
+SHA1 (patch-ad) = 29a395521ab7e08960fb7200f1dd4e0721d1895d
diff --git a/misc/pinfo/patches/patch-ad b/misc/pinfo/patches/patch-ad
new file mode 100644
index 00000000000..9569dd8256d
--- /dev/null
+++ b/misc/pinfo/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.3 2008/06/12 02:14:37 joerg Exp $
+
+--- po/Makefile.in.in.orig	2008-06-11 09:15:29.000000000 +0000
++++ po/Makefile.in.in
+@@ -124,15 +124,15 @@ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r $(MKINSTALLDIRS); then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
+ 	else \
+-	  $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
++	    *)     destdir=${DESTDIR}$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/misc/ppower/Makefile b/misc/ppower/Makefile
index c66fe622a94..c4e243292f5 100644
--- a/misc/ppower/Makefile
+++ b/misc/ppower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/25 12:44:26 dsainty Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=	ppower-0.1.5
@@ -9,6 +9,8 @@ MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://ppower.sourceforge.net/
 COMMENT=	X10 controller software for the CM11A interface
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 #LICENSE=       	GPL
 
 GNU_CONFIGURE=		YES
@@ -19,9 +21,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 EGDIR=			${PREFIX}/share/examples/ppower
 CONF_FILES+=		${EGDIR}/ppower.conf ${PKG_SYSCONFDIR}/ppower.conf
 
+INSTALLATION_DIRS=	share/examples/ppower
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ppower
 	${INSTALL_DATA} \
-		${WRKSRC}/etc/ppower.conf ${PREFIX}/share/examples/ppower
+		${WRKSRC}/etc/ppower.conf ${DESTDIR}${PREFIX}/share/examples/ppower
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/pyqt_memaid/Makefile b/misc/pyqt_memaid/Makefile
index b0fcf5cb835..0f9a7e1cb9f 100644
--- a/misc/pyqt_memaid/Makefile
+++ b/misc/pyqt_memaid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/04/25 20:39:10 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:37 joerg Exp $
 #
 
 DISTNAME=		pyqt_memaid_0.2.4
@@ -18,6 +18,8 @@ USE_LANGUAGES=	c
 NO_BUILD=	yes
 PYDISTUTILSPKG=	yes
 
+INSTALLATION_DIRS=	share/doc/pyqt_memaid
+
 # Necessary for 0.2.4 because the files were created for an earlier
 # version of py-qt3, and don't work with the current pkgsrc version.
 do-configure:
@@ -30,9 +32,8 @@ do-configure:
 
 # XXX: convert.py missing in distribution, should be installed too
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pyqt_memaid
 	${INSTALL_DATA} ${WRKSRC}/pyqt_memaid/docs/pyqt_memaid.html \
-		${PREFIX}/share/doc/pyqt_memaid
+		${DESTDIR}${PREFIX}/share/doc/pyqt_memaid
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"