DESTDIR support.

10 files changed, 45 insertions, 25 deletions

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