From 2102a055adffd47c5968002068e9f1827b14e15e Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 2 Nov 2006 17:59:37 +0000
Subject: DESTDIR support.

---
 audio/flac/Makefile                |  3 ++-
 audio/libao/Makefile               |  4 ++--
 audio/libao/Makefile.common        |  4 +++-
 audio/libvorbis/Makefile           |  3 ++-
 audio/speex/Makefile               |  4 +++-
 audio/vorbis-tools/Makefile        |  4 +++-
 devel/autoconf213/Makefile         |  3 ++-
 devel/autoconf213/distinfo         |  4 ++--
 devel/autoconf213/patches/patch-aa | 33 +++++++++++++++++++++------------
 devel/automake/Makefile            |  4 +++-
 devel/bison/Makefile               |  3 ++-
 devel/glib/Makefile                |  3 ++-
 devel/libidn/Makefile              |  3 ++-
 devel/m4/Makefile                  |  9 +++++----
 devel/nasm/Makefile                |  5 ++++-
 devel/pkg-config/Makefile          |  3 ++-
 graphics/jpeg/Makefile             | 11 +++++++----
 graphics/jpeg/distinfo             |  4 ++--
 graphics/jpeg/patches/patch-aa     |  4 ++--
 graphics/png/Makefile              |  3 ++-
 graphics/tiff/Makefile             |  3 ++-
 misc/screen/Makefile               |  9 +++++----
 misc/xdg-dirs/Makefile             |  4 +++-
 pkgtools/createbuildlink/Makefile  |  7 ++++---
 pkgtools/digest/Makefile           |  5 +++--
 pkgtools/pkgdiff/Makefile          |  9 +++++----
 pkgtools/verifypc/Makefile         |  7 ++++---
 www/curl/Makefile                  | 16 +++++++++-------
 28 files changed, 108 insertions(+), 66 deletions(-)

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 63071b31220..e3913fcae28 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/08/27 03:00:19 ben Exp $
+# $NetBSD: Makefile,v 1.38 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=	flac-1.1.2
 PKGREVISION=	1
@@ -10,6 +10,7 @@ HOMEPAGE=	http://flac.sourceforge.net/
 COMMENT=	Free lossless audio codec
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 51548157102..f34d944c8f7 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/13 21:26:17 reed Exp $
+# $NetBSD: Makefile,v 1.31 2006/11/02 17:59:37 joerg Exp $
 
 PKGREVISION=		4
 
@@ -7,6 +7,6 @@ PKG_INSTALLATION_TYPES=	overwrite
 .include "Makefile.common"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/ao/plugins-2
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-2
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 5d79f7acb30..28370077234 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2006/04/22 07:32:24 lukem Exp $
+# $NetBSD: Makefile.common,v 1.27 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=	libao-0.8.6
 CATEGORIES=	audio devel
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ao/
 COMMENT=	Cross-platform audio library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DISTINFO_FILE=	${.CURDIR}/../../audio/libao/distinfo
 PATCHDIR=	${.CURDIR}/../../audio/libao/patches
 
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index eb056347124..c0e9cf8227b 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=	libvorbis-1.1.2
 CATEGORIES=	devel audio
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.xiph.org/vorbis/
 COMMENT=	Library for the Ogg Vorbis audio encoding format
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index d52ae9f8347..86a10d7c57e 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/11 03:15:07 reed Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/02 17:59:37 joerg Exp $
 #
 
 DISTNAME=	speex-1.0.5
@@ -9,6 +9,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.speex.org/
 COMMENT=	Open-source, patent-free voice codec
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	speex.pc.in
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 10139eba7eb..7fe274211bb 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/06/15 13:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=	vorbis-tools-1.1.1
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.vorbis.com/
 COMMENT=	Ogg Vorbis encoder and player
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # list it into IPv6-ready packages
 BUILD_DEFS+=	USE_INET6
 
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 5b229b091f4..85e0f6c4e2f 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=	autoconf213-2.13
@@ -16,6 +16,7 @@ CONFLICTS=		autoconf-devel-[0-9]*
 CONFLICTS=		autoconf<2.50
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
diff --git a/devel/autoconf213/distinfo b/devel/autoconf213/distinfo
index 812ee02be12..fe23a61e654 100644
--- a/devel/autoconf213/distinfo
+++ b/devel/autoconf213/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/11/02 18:17:22 joerg Exp $
 
 SHA1 (autoconf-2.13.tar.gz) = e4826c8bd85325067818f19b2b2ad2b625da66fc
 RMD160 (autoconf-2.13.tar.gz) = 0d1fa0992280ed71c0d72487a5a4c246d1c1b18a
 Size (autoconf-2.13.tar.gz) = 443844 bytes
-SHA1 (patch-aa) = fb21f3f36130023699898ee439b2f233a6be45bf
+SHA1 (patch-aa) = 82b3c0f421f8c5c34b68c625eccff516a4c8cb0c
 SHA1 (patch-ab) = eeb90d28fdd78b39426023110f56df0ab14acd73
 SHA1 (patch-ac) = 4351aecfbfe8f992144b1f6f536cbef3ac9d0e19
 SHA1 (patch-ad) = 640b838fed5e04586e940a5dad543903e4f8be9a
diff --git a/devel/autoconf213/patches/patch-aa b/devel/autoconf213/patches/patch-aa
index 905d8f8e297..4fcbe3ba7bf 100644
--- a/devel/autoconf213/patches/patch-aa
+++ b/devel/autoconf213/patches/patch-aa
@@ -1,41 +1,50 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/03 19:25:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/11/02 18:17:22 joerg Exp $
 
---- Makefile.in.orig	Tue Jan  5 14:27:16 1999
+--- Makefile.in.orig	1999-01-05 13:27:16.000000000 +0000
 +++ Makefile.in
-@@ -141,7 +141,7 @@ installdirs:
+@@ -137,36 +137,32 @@ installcheck: all install
+ 	cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
+ 
+ installdirs:
+-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
++	$(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir) ${DESTDIR}$(acdatadir)
  
  install: all $(M4FILES) acconfig.h installdirs install-info
  	for p in $(ASCRIPTS); do \
 -	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+	  $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++	  $(INSTALL) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  	for i in $(M4FROZEN); do \
- 	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-@@ -150,9 +150,9 @@ install: all $(M4FILES) acconfig.h insta
- 	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
+-	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
++	  $(INSTALL_DATA) $$i ${DESTDIR}$(acdatadir)/$$i; \
+ 	done
+ 	for i in $(M4FILES) acconfig.h; do \
+-	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++	  $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
  	done
  	-if test -f autoscan; then \
 -	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+	$(INSTALL) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
++	$(INSTALL) autoscan ${DESTDIR}$(bindir)/`echo autoscan|sed '$(transform)'`; \
  	for i in acfunctions acheaders acidentifiers acprograms \
 -	  acmakevars; do \
+-	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
 +	  acmakevars config.guess config.sub; do \
- 	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++	$(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
  	done; \
  	else :; fi
-@@ -160,13 +160,9 @@ install: all $(M4FILES) acconfig.h insta
+ 
  # Don't cd, to avoid breaking install-sh references.
  install-info: info installdirs
  	if test -f autoconf.info; then \
 -	  for i in *.info*; do \
 -	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
 -	  done; \
-+	  $(INSTALL_DATA) autoconf.info $(infodir)/autoconf213.info; \
++	  $(INSTALL_DATA) autoconf.info ${DESTDIR}$(infodir)/autoconf213.info; \
  	else \
 -	  for i in $(srcdir)/*.info*; do \
 -	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
 -	  done; \
-+	  $(INSTALL_DATA) $(srcdir)/autoconf.info $(infodir)/autoconf213.info; \
++	  $(INSTALL_DATA) $(srcdir)/autoconf.info ${DESTDIR}$(infodir)/autoconf213.info; \
  	fi
  
  uninstall:
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index cde02d29767..dca6133aefa 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/10/26 14:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2006/11/02 18:17:22 joerg Exp $
 #
 
 DISTNAME=	automake-1.10
@@ -11,6 +11,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/automake/automake.html
 COMMENT=	GNU Standards-compliant Makefile generator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	autoconf>=2.60:../../devel/autoconf
 
 USE_TOOLS+=	gm4:run perl:run
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 302e1a1305d..71cd487bf87 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/06/11 13:59:56 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=		bison-2.3
 CATEGORIES=		devel
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.gnu.org/software/bison/bison.html
 COMMENT=		GNU yacc(1) replacement
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index ae952bd2f03..f6aa86a569e 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2006/07/19 19:14:38 jlam Exp $
+# $NetBSD: Makefile,v 1.83 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=		glib-1.2.10
 PKGREVISION=		10
@@ -14,6 +14,7 @@ COMMENT=		Some useful routines for C programming (glib1)
 CONFLICTS=		gtk+-1.0.*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 2a1b72c73ca..c9818d7f519 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/10/23 22:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=	libidn-0.6.8
 CATEGORIES=	devel
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/libidn/
 COMMENT=	Internationalized Domain Names command line tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index be92479d476..dde15eed9b1 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=	m4-1.4.7
 CATEGORIES=	devel
@@ -9,6 +9,7 @@ HOMEPAGE=	http://directory.fsf.org/gnum4.html
 COMMENT=	GNU version of UNIX m4 macro language processor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 INFO_FILES=		# PLIST
@@ -30,10 +31,10 @@ PLIST_SUBST+=		GM4_LINK="@comment "
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/m4
-	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/m4
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/m4
+	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4
 .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-	${LN} -sf ${GNU_PROGRAM_PREFIX}m4 ${PREFIX}/bin/gm4
+	${LN} -sf ${GNU_PROGRAM_PREFIX}m4 ${DESTDIR}${PREFIX}/bin/gm4
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index e470532d38c..bc8b7282510 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/31 05:37:09 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=	nasm-0.98.39
 PKGREVISION=	2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://nasm.sourceforge.net/
 COMMENT=	General-purpose x86 assembler
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake makeinfo perl
 GCC_REQD+=		3.0
@@ -20,6 +21,8 @@ INFO_FILES=		# PLIST
 BUILD_TARGET=		everything
 INSTALL_TARGET=		install_everything
 
+INSTALL_ENV+=	INSTALLROOT=${DESTDIR}
+
 MAKE_ENV+=	PERL5=${PERL5:Q}			\
 		INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
 
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 64b0dff8de4..00c47fa2a7c 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/08/22 18:21:22 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/11/02 18:17:22 joerg Exp $
 #
 
 DISTNAME=	pkg-config-0.21
@@ -10,6 +10,7 @@ HOMEPAGE=	http://pkgconfig.freedesktop.org/
 COMMENT=	System for managing library compile/link flags
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 3aced557980..fea15721bab 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/09/03 00:56:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/02 18:00:43 joerg Exp $
 #
 
 DISTNAME=		jpegsrc.v6b
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www.ijg.org/
 COMMENT=		IJG's jpeg compression utilities
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
@@ -24,9 +25,11 @@ CONFIGURE_ARGS+=	--enable-static
 INSTALL_TARGET=		install install-lib
 INSTALLATION_DIRS=	bin lib include ${PKGMANDIR}/man1
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/jpeg
-	${INSTALL_DATA} ${WRKSRC}/jpegint.h ${PREFIX}/include
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jpeg
+	${INSTALL_DATA} ${WRKSRC}/*.doc ${DESTDIR}${PREFIX}/share/doc/jpeg
+	${INSTALL_DATA} ${WRKSRC}/jpegint.h ${DESTDIR}${PREFIX}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index 3ef3aa28c67..70cc612b1e3 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/12/27 17:30:50 reed Exp $
+$NetBSD: distinfo,v 1.5 2006/11/02 18:00:43 joerg Exp $
 
 SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
 RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
 Size (jpegsrc.v6b.tar.gz) = 613261 bytes
-SHA1 (patch-aa) = c328b9d8840749a8a9c57c28250bee223f7d79bf
+SHA1 (patch-aa) = ffb4a89925187ebc74487ad8980266d1230a5efb
diff --git a/graphics/jpeg/patches/patch-aa b/graphics/jpeg/patches/patch-aa
index 36268798cb7..d26e5839ca0 100644
--- a/graphics/jpeg/patches/patch-aa
+++ b/graphics/jpeg/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2005/12/27 17:30:50 reed Exp $
+$NetBSD: patch-aa,v 1.9 2006/11/02 18:00:43 joerg Exp $
 
 --- makefile.cfg.orig	1998-03-21 11:08:57.000000000 -0800
 +++ makefile.cfg
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.8 2005/12/27 17:30:50 reed Exp $
  manprefix =
  manext = 1
 -mandir = $(prefix)/man/man$(manext)
-+mandir = @mandir@/man$(manext)
++mandir = $(DESTDIR)@mandir@/man$(manext)
  
  # The name of your C compiler:
  CC= @CC@
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 56ad1ee0b13..eec8f552f81 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2006/07/07 09:35:05 rillig Exp $
+# $NetBSD: Makefile,v 1.83 2006/11/02 18:00:43 joerg Exp $
 
 DISTNAME=	libpng-1.2.12
 PKGNAME=	${DISTNAME:S/lib//}
@@ -15,6 +15,7 @@ HOMEPAGE=	http://www.libpng.org/pub/png/
 COMMENT=	Library for manipulating PNG images
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 PKGCONFIG_OVERRIDE=	scripts/libpng.pc.in
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index e22efd50998..282ccba36de 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2006/08/02 15:42:25 salo Exp $
+# $NetBSD: Makefile,v 1.85 2006/11/02 18:00:43 joerg Exp $
 
 DISTNAME=	tiff-3.8.2
 PKGREVISION=	3
@@ -13,6 +13,7 @@ COMMENT=	Library and tools for reading and writing TIFF data files
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index a297b5a69d5..5bfde9790c7 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/10/29 15:08:27 tron Exp $
+# $NetBSD: Makefile,v 1.70 2006/11/02 18:21:18 joerg Exp $
 
 DISTNAME=	screen-4.0.3
 CATEGORIES=	misc shells
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/screen/screen.html
 COMMENT=	Multi-screen window manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NOT_FOR_PLATFORM=	Interix-*-* # user auth and username size fixes needed
 
@@ -39,11 +40,11 @@ PLIST_SUBST+=	SCREEN_TERMINFO="@comment "
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc			\
-		${PREFIX}/share/examples/screen/etcscreenrc
+		${DESTDIR}${PREFIX}/share/examples/screen/etcscreenrc
 	${INSTALL_DATA} ${WRKSRC}/etc/screenrc				\
-		${PREFIX}/share/examples/screen/screenrc
+		${DESTDIR}${PREFIX}/share/examples/screen/screenrc
 
 .PHONY: screen-terminfo
 screen-terminfo:
diff --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile
index e8af19c4504..ebec370e6c0 100644
--- a/misc/xdg-dirs/Makefile
+++ b/misc/xdg-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/08 16:27:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/02 18:21:18 joerg Exp $
 #
 
 DISTNAME=	xdg-dirs-1.4
@@ -10,6 +10,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	# empty
 COMMENT=	Shared XDG directories
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	gnome2-dirs<=1.2
 
 NO_BUILD=	yes
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile
index c1463222981..bd26e187e3d 100644
--- a/pkgtools/createbuildlink/Makefile
+++ b/pkgtools/createbuildlink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/07/12 13:29:03 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/11/02 18:02:07 joerg Exp $
 
 DISTNAME=	createbuildlink-3.13
 CATEGORIES=	pkgtools sysutils
@@ -9,6 +9,7 @@ MAINTAINER=	rh@NetBSD.org
 COMMENT=	Shell script to help creating buildlink3.mk files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
@@ -30,8 +31,8 @@ do-configure:
 
 do-install:
 .for scr in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC:Q}/${scr:Q} ${PREFIX:Q}/bin/${scr:Q}
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/${scr:Q} ${DESTDIR}${PREFIX}/bin/${scr:Q}
 .endfor
-	${INSTALL_MAN} ${FILESDIR:Q}/${SCRIPT:Q}.8 ${PREFIX:Q}/${PKGMANDIR:Q}/man8
+	${INSTALL_MAN} ${FILESDIR:Q}/${SCRIPT:Q}.8 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 9093779469d..87d8c7aded9 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/08/29 13:43:11 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2006/11/02 18:02:07 joerg Exp $
 #
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the VERSION definition.
@@ -13,6 +13,7 @@ HOMEPAGE?=	http://www.NetBSD.org/Documentation/software/packages.html
 COMMENT?=	Message digest wrapper utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 
@@ -33,7 +34,7 @@ do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
 
 pre-install:
-	-@${MKDIR} ${PKG_DBDIR}
+	-@${MKDIR} ${DESTDIR}${PKG_DBDIR}
 
 do-test:
 	@${ECHO} "No news is good news"
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index df7c249d09e..c436ccef2a5 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/10/02 16:21:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.63 2006/11/02 18:02:07 joerg Exp $
 #
 
 DISTNAME=	pkgdiff-0.119
@@ -11,6 +11,7 @@ HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Tools to create, maintain and send back patches for pkgsrc
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
@@ -68,12 +69,12 @@ do-build:
 
 do-install:
 .for FILE in mkpatches patchdiff pkgdiff pkgvi feedback-patches
-	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${DESTDIR}${PREFIX}/bin
 .   if !empty(MANINSTALL:Mcatinstall)
-	${INSTALL_MAN} ${WRKSRC}/${FILE}.0 ${PREFIX}/${PKGMANDIR}/cat1
+	${INSTALL_MAN} ${WRKSRC}/${FILE}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 .   endif
 .   if !empty(MANINSTALL:Mmaninstall)
-	${INSTALL_MAN} ${FILESDIR}/${FILE}.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/${FILE}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .   endif
 .endfor
 
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile
index 56867703526..66cefe9b95c 100644
--- a/pkgtools/verifypc/Makefile
+++ b/pkgtools/verifypc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/14 15:35:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2006/11/02 18:02:08 joerg Exp $
 #
 
 DISTNAME=	verifypc-1.4
@@ -10,6 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Sanity check package dependencies according to pkg-config
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
@@ -31,7 +32,7 @@ do-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/verifypc.sh \
-		${PREFIX}/bin/verifypc
-	${INSTALL_MAN} ${WRKSRC}/verifypc.1 ${PREFIX}/${PKGMANDIR}/man1/
+		${DESTDIR}${PREFIX}/bin/verifypc
+	${INSTALL_MAN} ${WRKSRC}/verifypc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/curl/Makefile b/www/curl/Makefile
index feaeee634a7..f817242b892 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/10/31 23:04:22 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2006/11/02 18:01:09 joerg Exp $
 
 DISTNAME=	curl-7.16.0
 CATEGORIES=	www
@@ -12,6 +12,7 @@ HOMEPAGE=	http://curl.haxx.se/
 COMMENT=	Client that groks URLs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 # list it into IPv6-ready packages
 BUILD_DEFS+=	USE_INET6
@@ -47,16 +48,17 @@ post-configure:
 	      ${WRKSRC}/include/curl/multi.h
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl
-	for _f in MANUAL TheArtOfHttpScripting FAQ		\
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/curl
+	for _f in MANUAL TheArtOfHttpScripting FAQ			\
 		curl-config.pdf curl.pdf; do				\
-		${INSTALL_DATA} ${WRKSRC}/docs/$${_f}		\
-			 ${PREFIX}/share/doc/curl/${_f};	\
+		${INSTALL_DATA} ${WRKSRC}/docs/$${_f}			\
+			 ${DESTDIR}${PREFIX}/share/doc/curl/${_f};	\
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/curl
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/curl
 	for _f in ${WRKSRC}/docs/examples/*.c				\
 		${WRKSRC}/docs/examples/README; do			\
-		${INSTALL_DATA} $${_f} ${PREFIX}/share/examples/curl;	\
+		${INSTALL_DATA} $${_f} 					\
+			${DESTDIR}${PREFIX}/share/examples/curl;	\
 	done
 
 .include "../../devel/libidn/buildlink3.mk"
-- 
cgit v1.2.3