DESTDIR support.

4 files changed, 28 insertions, 21 deletions

diff --git a/sysutils/iwi-firmware/Makefile b/sysutils/iwi-firmware/Makefile
index 692f4d4ff8e..627bb21523b 100644
--- a/sysutils/iwi-firmware/Makefile
+++ b/sysutils/iwi-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:15 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/11/03 06:57:40 joerg Exp $
 #
 
 DISTNAME=		ipw2200-fw-2.3
@@ -12,6 +12,8 @@ MAINTAINER=		Damien.Bergamini@Free.FR
 HOMEPAGE=		http://damien.bergamini.free.fr/ipw/
 COMMENT=		Firmware binary images for iwi(4) driver
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LICENSE=		intel-ipw-license
 
 RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=5
@@ -25,15 +27,16 @@ WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
+INSTALLATION_DIRS+=	libdata/if_iwi
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/if_iwi
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/libdata/if_iwi
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-boot.fw ${PREFIX}/libdata/if_iwi/iwi-boot.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss.fw ${PREFIX}/libdata/if_iwi/iwi-bss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss_ucode.fw ${PREFIX}/libdata/if_iwi/iwi-ucode-bss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss.fw ${PREFIX}/libdata/if_iwi/iwi-ibss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss_ucode.fw ${PREFIX}/libdata/if_iwi/iwi-ucode-ibss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer.fw ${PREFIX}/libdata/if_iwi/iwi-sniffer.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer_ucode.fw ${PREFIX}/libdata/if_iwi/iwi-ucode-sniffer.fw
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/libdata/if_iwi
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-boot.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-boot.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-bss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-bss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ibss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-ibss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-sniffer.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-sniffer.fw
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index b64e620230f..97efc4ea6e7 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/11/03 06:56:23 joerg Exp $
 #
 
 DISTNAME=	expat-2.0.0
@@ -11,6 +11,7 @@ HOMEPAGE=	http://expat.sourceforge.net/
 COMMENT=	XML parser library written in C
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -19,8 +20,8 @@ USE_TOOLS+=		gmake
 DOCDIR=	${PREFIX}/share/doc/html/expat
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ca816dd6928..f187a17283c 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2006/10/30 20:57:30 drochner Exp $
+# $NetBSD: Makefile,v 1.84 2006/11/03 06:56:23 joerg Exp $
 
 DISTNAME=	libxml2-2.6.27
 CATEGORIES=	textproc
@@ -10,6 +10,7 @@ HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	XML parser library from the GNOME project
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 8a67ff72032..4dcbc81e45b 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/29 06:22:20 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/03 06:56:24 joerg Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://xmlcatmgr.sourceforge.net/
 COMMENT=	XML and SGML catalog manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 
@@ -26,6 +27,8 @@ REQD_DIRS=	${PREFIX}/share/sgml ${PREFIX}/share/xml
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ { next; }
 
+INSTALLATION_DIRS+=	share/examples/xmlcatmgr
+
 post-build:
 	@${ECHO} "Creating SGML catalogs..."
 	@${WRKSRC}/xmlcatmgr -sc ${WRKDIR}/catalog.etc.sgml create
@@ -39,10 +42,9 @@ post-build:
 		nextCatalog ${PREFIX}/share/xml/catalog
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog.etc.sgml ${EGDIR}/catalog.etc.sgml
-	${INSTALL_DATA} ${WRKDIR}/catalog.etc.xml ${EGDIR}/catalog.etc.xml
-	${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${EGDIR}/catalog.share.sgml
-	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${EGDIR}/catalog.share.xml
+	${INSTALL_DATA} ${WRKDIR}/catalog.etc.sgml ${DESTDIR}${EGDIR}/catalog.etc.sgml
+	${INSTALL_DATA} ${WRKDIR}/catalog.etc.xml ${DESTDIR}${EGDIR}/catalog.etc.xml
+	${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${DESTDIR}${EGDIR}/catalog.share.sgml
+	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${DESTDIR}${EGDIR}/catalog.share.xml
 
 .include "../../mk/bsd.pkg.mk"