user-destdir support

8 files changed, 44 insertions, 33 deletions

diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index c6f9f0652dc..2fc33840fc9 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/03 14:05:38 obache Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 22:01:50 joerg Exp $
 
 DISTNAME=	html2text-1.3.2a
 CATEGORIES=	textproc
@@ -9,6 +9,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.mbayer.de/html2text/
 COMMENT=	Advanced HTML-to-text converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 GCC_REQD+=		3.0
 HAS_CONFIGURE=		yes
@@ -20,8 +22,8 @@ post-build:
 	${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${PREFIX}/${PKGMANDIR}/man5/html2textrc.5
+	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/html2textrc.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/html2wml/Makefile b/textproc/html2wml/Makefile
index 43f053ae1ee..39c0e618293 100644
--- a/textproc/html2wml/Makefile
+++ b/textproc/html2wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/01/03 14:15:01 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/07 22:01:28 joerg Exp $
 
 DISTNAME=	html2wml-0.4.8r2
 PKGNAME=	html2wml-0.4.8.2
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 # HOMEPAGE=	http://maddingue.free.fr/softwares/html2wml.html
 COMMENT=	On-the-fly HTML to WML conversion
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-libwww>=5.53:../../www/p5-libwww
 DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Text-Template>=1.31:../../textproc/p5-Text-Template
@@ -24,7 +26,7 @@ REPLACE_PERL=	${WRKSRC}/html2wml.cgi
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${PREFIX}/bin/html2wml
-	${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/${PKGMANDIR}/man1/html2wml.1
+	${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${DESTDIR}${PREFIX}/bin/html2wml
+	${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/html2wml.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hunspell-de/Makefile b/textproc/hunspell-de/Makefile
index ceac880ca46..e829d8a89e0 100644
--- a/textproc/hunspell-de/Makefile
+++ b/textproc/hunspell-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/01/09 11:34:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/07 22:00:41 joerg Exp $
 #
 
 DISTNAME=	igerman98-20090107
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.j3e.de/ispell/igerman98/
 COMMENT=	German dictionaries for hunspell
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
 DEPENDS+=	hunspell>=1.1.5:../../textproc/hunspell
 
@@ -32,7 +34,7 @@ SUBST_MESSAGE.sed=	Fixing path to sed.
 INSTALLATION_DIRS=	share/hunspell
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/hunspell/de*aff ${PREFIX}/share/hunspell
-	${INSTALL_DATA} ${WRKSRC}/hunspell/de*dic ${PREFIX}/share/hunspell
+	${INSTALL_DATA} ${WRKSRC}/hunspell/de*aff ${DESTDIR}${PREFIX}/share/hunspell
+	${INSTALL_DATA} ${WRKSRC}/hunspell/de*dic ${DESTDIR}${PREFIX}/share/hunspell
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hunspell-en_GB/Makefile b/textproc/hunspell-en_GB/Makefile
index 08693760280..b7998fb3131 100644
--- a/textproc/hunspell-en_GB/Makefile
+++ b/textproc/hunspell-en_GB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/11 18:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/07 21:59:34 joerg Exp $
 #
 
 VERSION=	20061130
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://en-gb.pyxidium.co.uk/dictionary/
 COMMENT=	British English dictionary for hunspell
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	hunspell-dictionaries/en_GB-${VERSION}
 # don't want -L
 EXTRACT_OPTS_ZIP=	-aqo
@@ -24,10 +26,10 @@ INSTALLATION_DIRS=	share/hunspell share/doc/hunspell-en_GB
 do-build:
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/en_GB.* ${PREFIX}/share/hunspell
+	${INSTALL_DATA} ${WRKSRC}/en_GB.* ${DESTDIR}${PREFIX}/share/hunspell
 	${INSTALL_DATA} ${WRKSRC}/README_en_GB.txt \
-		${PREFIX}/share/doc/hunspell-en_GB
+		${DESTDIR}${PREFIX}/share/doc/hunspell-en_GB
 	${INSTALL_DATA} ${WRKSRC}/dictionary.lst \
-		${PREFIX}/share/doc/hunspell-en_GB
+		${DESTDIR}${PREFIX}/share/doc/hunspell-en_GB
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hunspell-en_US/Makefile b/textproc/hunspell-en_US/Makefile
index e74aae6158a..d8b0b873579 100644
--- a/textproc/hunspell-en_US/Makefile
+++ b/textproc/hunspell-en_US/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/11 18:38:15 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/07 21:58:38 joerg Exp $
 #
 
 VERSION=	20060207
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wiki.services.openoffice.org/wiki/Dictionaries
 COMMENT=	US American English dictionaries for hunspell
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	hunspell-dictionaries/en_US-${VERSION}
 # don't want -L
 EXTRACT_OPTS_ZIP=	-aqo
@@ -24,8 +26,8 @@ INSTALLATION_DIRS=	share/hunspell share/doc/hunspell-en_US
 do-build:
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/en_US.* ${PREFIX}/share/hunspell
+	${INSTALL_DATA} ${WRKSRC}/en_US.* ${DESTDIR}${PREFIX}/share/hunspell
 	${INSTALL_DATA} ${WRKSRC}/README_en_US.txt \
-		${PREFIX}/share/doc/hunspell-en_US
+		${DESTDIR}${PREFIX}/share/doc/hunspell-en_US
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index 7422814dab2..cc129f91eaa 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/02 13:38:53 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 22:00:07 joerg Exp $
 
 DISTNAME=		Isearch-1.47.01
 PKGNAME=		isearch-1.47.01
@@ -9,15 +9,16 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.etymon.com/Isearch/
 COMMENT=		Advanced text indexing and searching system
 
-GNU_CONFIGURE=		yes
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
+INSTALLATION_DIRS=	share/doc/isearch share/doc/html/isearch
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isearch
-	${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${PREFIX}/share/doc/isearch
-	${INSTALL_DATA} ${WRKSRC}/doc/DebugFirewall.doc ${PREFIX}/share/doc/isearch
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/isearch
-	${INSTALL_DATA} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/html/isearch/
+	${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${DESTDIR}${PREFIX}/share/doc/isearch
+	${INSTALL_DATA} ${WRKSRC}/doc/DebugFirewall.doc ${DESTDIR}${PREFIX}/share/doc/isearch
+	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DESTDIR}${PREFIX}/share/doc/html/isearch/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/isearch/distinfo b/textproc/isearch/distinfo
index 9ca61e138b3..d511a931fc5 100644
--- a/textproc/isearch/distinfo
+++ b/textproc/isearch/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2007/12/01 16:42:26 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/07 22:00:07 joerg Exp $
 
 SHA1 (Isearch-1.47.01.tar.gz) = 86761d6055fdd7b954b7ac9d9fd3d0084d758e3f
 RMD160 (Isearch-1.47.01.tar.gz) = 2e7f4c21d8a2d3cb194823a881ee7315f88de66c
 Size (Isearch-1.47.01.tar.gz) = 484760 bytes
-SHA1 (patch-aa) = 5c8291a92f84cc47131e45586879cf986e6a5c4d
+SHA1 (patch-aa) = 028f38a707054d6bcf92f9855e333846fc841410
 SHA1 (patch-ab) = 1bdf80b2a355ac17ff090c7ae25d231bea5ab017
 SHA1 (patch-ac) = 232ef20b661a9e5fd32814da256a59c7146b7b69
 SHA1 (patch-ad) = 7f53e7dfb6c5e37d2c4f6cb12e087c678d07df25
diff --git a/textproc/isearch/patches/patch-aa b/textproc/isearch/patches/patch-aa
index 8a466219e62..7406fa66135 100644
--- a/textproc/isearch/patches/patch-aa
+++ b/textproc/isearch/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/05/03 22:36:09 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 22:00:07 joerg Exp $
 
 --- Makefile.orig	Mon Apr 29 11:36:52 2002
 +++ Makefile	Mon Apr 29 11:42:53 2002
@@ -67,12 +67,12 @@ $NetBSD: patch-aa,v 1.2 2002/05/03 22:36:09 jtb Exp $
 -	cp $(BIN_DIR)/Iget $(INSTALL)
 -	cp $(BIN_DIR)/zsearch $(INSTALL)
 -	cp $(BIN_DIR)/zpresent $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iindex $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Isearch $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iutil $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iget $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/zsearch $(INSTALL)
-+	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/zpresent $(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iindex ${DESTDIR}$(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Isearch ${DESTDIR}$(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iutil ${DESTDIR}$(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/Iget ${DESTDIR}$(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/zsearch ${DESTDIR}$(INSTALL)
++	$(BSD_INSTALL_PROGRAM) $(BIN_DIR)/zpresent ${DESTDIR}$(INSTALL)
  	@echo ""
  	@echo "To install Isearch-cgi, cd into the Isearch-cgi directory"
  	@echo "Then run the configure script"