user-destdir support

5 files changed, 26 insertions, 21 deletions

diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 5069d7915e8..98b62e988cb 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/07 21:34:26 joerg Exp $
 #
 
 DISTNAME=		jing-20030619
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.thaiopensource.com/relaxng/trang.html
 COMMENT=		RELAX NG validator in Java
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	pax
 
 USE_JAVA=		run
@@ -19,16 +21,14 @@ do-build:
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/jing
 	${ECHO} "${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/libexec/jing/jing.jar"' "$$@"' >> ${WRKSRC}/jing
 
+INSTALLATION_DIRS=	bin libexec/jing/lib share/doc/jing/doc
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/jing ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/jing
-	${INSTALL_DATA} ${WRKSRC}/bin/* ${PREFIX}/libexec/jing
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/jing/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/libexec/jing/lib
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jing
-	${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/jing
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jing/doc
-	cd ${WRKSRC}/doc && pax -pp -rw * ${PREFIX}/share/doc/jing/doc
+	${INSTALL_SCRIPT} ${WRKSRC}/jing ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/libexec/jing
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/libexec/jing/lib
+	${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${PREFIX}/share/doc/jing
+	cd ${WRKSRC}/doc && pax -pp -rw * ${DESTDIR}${PREFIX}/share/doc/jing/doc
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 31d74d7f821..4358de1604e 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/05/01 14:59:30 zafer Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/07 21:34:32 joerg Exp $
 
 DISTNAME=	kakasi-2.3.4
 PKGREVISION=	4
@@ -9,14 +9,16 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://kakasi.namazu.org/
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/cat1 ${PKGMANDIR}/ja_JP.EUC/man1
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.cat \
-		${PREFIX}/${PKGMANDIR}/ja_JP.EUC/cat1/kakasi.0
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/cat1/kakasi.0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/kbanner/Makefile b/textproc/kbanner/Makefile
index c2eb2503a4a..bc7b36b6ccf 100644
--- a/textproc/kbanner/Makefile
+++ b/textproc/kbanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 21:33:07 joerg Exp $
 
 DISTNAME=	kbanner2
 PKGNAME=	kbanner-2.1
@@ -10,6 +10,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/program.html
 COMMENT=	Display kanji files in large letters
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 BUILD_TARGET=	kbanner
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/kbanner/distinfo b/textproc/kbanner/distinfo
index 4de80d7a497..f0ea59493a2 100644
--- a/textproc/kbanner/distinfo
+++ b/textproc/kbanner/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/07/07 21:33:08 joerg Exp $
 
 SHA1 (kbanner2.tar.Z) = a557fd49ef76797513894ac8f7e218be52efb219
 RMD160 (kbanner2.tar.Z) = 42cdc13bbc5defd5825303fd17d664b40b7bfcb9
 Size (kbanner2.tar.Z) = 240221 bytes
-SHA1 (patch-aa) = 0b30d5b1af326e28fe581486931336b27dd26124
+SHA1 (patch-aa) = 707ed4b3f0b25d1f26db1dcb60d41822b7203a6d
 SHA1 (patch-ab) = a85c604703743047147e15a48705ad5f517e5273
 SHA1 (patch-ac) = 1f6964b8c936199e408ab5aceb06ddeb1a249751
 SHA1 (patch-ad) = 9f3a26d4ac3eab9e9c0094d02de09925f47b2b7b
diff --git a/textproc/kbanner/patches/patch-aa b/textproc/kbanner/patches/patch-aa
index 63c1c1645f3..939f2e4ae7b 100644
--- a/textproc/kbanner/patches/patch-aa
+++ b/textproc/kbanner/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 21:33:08 joerg Exp $
 
 --- Makefile.orig	Fri Oct 15 14:19:54 1993
 +++ Makefile	Thu May 18 00:48:33 2000
-@@ -1,21 +1,21 @@
+@@ -1,21 +1,20 @@
  SHELL = /bin/sh
 -DESTDIR = /usr/local/bin
 -MANUAL = /usr/local/man/man1/kbanner.1
 -CFLAGS = -O -KEOPT -KBREG -KINF
-+DESTDIR = $(PREFIX)/bin
 +MANUAL = $(PREFIX)/man/man1/kbanner.1
 +#CFLAGS = -O -KEOPT -KBREG -KINF
  OBJ = kbanner.o font1.o font2.o font3.o
@@ -29,5 +28,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
  install: kbanner
 -	cp kbanner $(DESTDIR)/
 -	cp kbanner.1 $(MANUAL)
-+	$(BSD_INSTALL_PROGRAM) kbanner $(DESTDIR)/
-+	$(BSD_INSTALL_MAN) kbanner.1 $(MANUAL)
++	$(BSD_INSTALL_PROGRAM) kbanner $(DESTDIR)${PREFIX}/bin
++	$(BSD_INSTALL_MAN) kbanner.1 ${DESTDIR}$(MANUAL)