From 0d2d494721a0675a0e6d34deb93e44c1e0a23422 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 29 Jan 2010 16:38:20 +0000
Subject: DESTDIR support

---
 converters/cn2jp/Makefile         | 13 +++++++------
 converters/cn2jp/distinfo         |  4 ++--
 converters/cn2jp/patches/patch-aa |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'converters/cn2jp')

diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index 6778e2a6aba..c713cc38c6e 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:12 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/29 16:43:34 joerg Exp $
 
 DISTNAME=	cn2jp1.4b
 PKGNAME=	cn2jp-1.4b
@@ -11,6 +11,7 @@ MAINTAINER=	rxg@NetBSD.org
 # HOMEPAGE=	http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
 COMMENT=	Library for code translation between Chinese and Japanese
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/cn2jp
@@ -18,12 +19,12 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 
 NO_CONFIGURE=	yes
-AUTO_MKDIRS=			yes
+
+INSTALLATION_DIRS+=	bin include lib share/doc/cn2jp
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cn2jp
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cn2jp
-	${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cn2jp
+	${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${DESTDIR}${PREFIX}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/cn2jp/distinfo b/converters/cn2jp/distinfo
index ef93fe32d93..31830ff90c0 100644
--- a/converters/cn2jp/distinfo
+++ b/converters/cn2jp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/06/21 15:00:51 minskim Exp $
+$NetBSD: distinfo,v 1.5 2010/01/29 16:43:34 joerg Exp $
 
 SHA1 (cn2jp1.4b.tar.gz) = 09cee0b189e5925a5378f1f817cc9593be899518
 RMD160 (cn2jp1.4b.tar.gz) = 7697648e23586a0fba0d840ba57cf816c175ac10
 Size (cn2jp1.4b.tar.gz) = 271660 bytes
-SHA1 (patch-aa) = a1b67afbc36161b2731a938d81e19af2c9fba7dd
+SHA1 (patch-aa) = cf112ba4083a1a7e3520c683435da78629340961
 SHA1 (patch-ab) = a5a43c0dd84515a5c8b7d0cacc9a49b9b378a8e1
 SHA1 (patch-ac) = b601a2893b8a94374e4b4271be49f87ee244ae53
 SHA1 (patch-ad) = 4c568df93470c404f12e4221fbb64c532ff18c6b
diff --git a/converters/cn2jp/patches/patch-aa b/converters/cn2jp/patches/patch-aa
index 2381db352ba..14f7cf8ddb2 100644
--- a/converters/cn2jp/patches/patch-aa
+++ b/converters/cn2jp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 16:43:34 joerg Exp $
 
 --- Makefile.orig	Tue Feb 27 22:35:44 1996
 +++ Makefile
@@ -26,9 +26,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $
 +LIB = libcn2jp.a
 +
 +install:
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) ${DESTDIR}$(PREFIX)/lib
 +	for i in $(PROG);do \
-+		$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i $(PREFIX)/bin; \
++		$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i ${DESTDIR}$(PREFIX)/bin; \
 +	done
 +
 +all: clean mktable $(LIB) makeall
-- 
cgit v1.2.3