Fri Jan 29 16:43:34 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.14 -r1.15 pkgsrc/converters/cn2jp/Makefile
diff -r1.4 -r1.5 pkgsrc/converters/cn2jp/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/converters/cn2jp/patches/patch-aa
cvs diff -r1.14 -r1.15 pkgsrc/converters/cn2jp/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/cn2jp/Makefile 2009/06/30 00:07:12 1.14
+++ pkgsrc/converters/cn2jp/Makefile 2010/01/29 16:43:34 1.15
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:12 joerg Exp $ 1# $NetBSD: Makefile,v 1.15 2010/01/29 16:43:34 joerg Exp $
2 2
3DISTNAME= cn2jp1.4b 3DISTNAME= cn2jp1.4b
4PKGNAME= cn2jp-1.4b 4PKGNAME= cn2jp-1.4b
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= converters 6CATEGORIES= converters
7# maybe ftp://ftp.ifcss.org/pub/software/ 7# maybe ftp://ftp.ifcss.org/pub/software/
8MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
9 9
10MAINTAINER= rxg@NetBSD.org 10MAINTAINER= rxg@NetBSD.org
11# HOMEPAGE= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/ 11# HOMEPAGE= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
12COMMENT= Library for code translation between Chinese and Japanese 12COMMENT= Library for code translation between Chinese and Japanese
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
14MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
15 16
16WRKSRC= ${WRKDIR}/cn2jp 17WRKSRC= ${WRKDIR}/cn2jp
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18USE_TOOLS+= gmake 19USE_TOOLS+= gmake
19 20
20NO_CONFIGURE= yes 21NO_CONFIGURE= yes
21AUTO_MKDIRS= yes 22
 23INSTALLATION_DIRS+= bin include lib share/doc/cn2jp
22 24
23post-install: 25post-install:
24 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cn2jp 26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cn2jp
25 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cn2jp 27 ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${DESTDIR}${PREFIX}/include
26 ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${PREFIX}/include 28 ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${DESTDIR}${PREFIX}/include
27 ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${PREFIX}/include 
28 29
29.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/converters/cn2jp/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/cn2jp/distinfo 2006/06/21 15:00:51 1.4
+++ pkgsrc/converters/cn2jp/distinfo 2010/01/29 16:43:34 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2006/06/21 15:00:51 minskim Exp $ 1$NetBSD: distinfo,v 1.5 2010/01/29 16:43:34 joerg Exp $
2 2
3SHA1 (cn2jp1.4b.tar.gz) = 09cee0b189e5925a5378f1f817cc9593be899518 3SHA1 (cn2jp1.4b.tar.gz) = 09cee0b189e5925a5378f1f817cc9593be899518
4RMD160 (cn2jp1.4b.tar.gz) = 7697648e23586a0fba0d840ba57cf816c175ac10 4RMD160 (cn2jp1.4b.tar.gz) = 7697648e23586a0fba0d840ba57cf816c175ac10
5Size (cn2jp1.4b.tar.gz) = 271660 bytes 5Size (cn2jp1.4b.tar.gz) = 271660 bytes
6SHA1 (patch-aa) = a1b67afbc36161b2731a938d81e19af2c9fba7dd 6SHA1 (patch-aa) = cf112ba4083a1a7e3520c683435da78629340961
7SHA1 (patch-ab) = a5a43c0dd84515a5c8b7d0cacc9a49b9b378a8e1 7SHA1 (patch-ab) = a5a43c0dd84515a5c8b7d0cacc9a49b9b378a8e1
8SHA1 (patch-ac) = b601a2893b8a94374e4b4271be49f87ee244ae53 8SHA1 (patch-ac) = b601a2893b8a94374e4b4271be49f87ee244ae53
9SHA1 (patch-ad) = 4c568df93470c404f12e4221fbb64c532ff18c6b 9SHA1 (patch-ad) = 4c568df93470c404f12e4221fbb64c532ff18c6b
cvs diff -r1.1.1.1 -r1.2 pkgsrc/converters/cn2jp/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/converters/cn2jp/patches/patch-aa 2002/03/30 06:03:39 1.1.1.1
+++ pkgsrc/converters/cn2jp/patches/patch-aa 2010/01/29 16:43:34 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $ 1$NetBSD: patch-aa,v 1.2 2010/01/29 16:43:34 joerg Exp $
2 2
3--- Makefile.orig Tue Feb 27 22:35:44 1996 3--- Makefile.orig Tue Feb 27 22:35:44 1996
4+++ Makefile 4+++ Makefile
5@@ -1,7 +1,5 @@ 5@@ -1,7 +1,5 @@
6-INCLUDE= 6-INCLUDE=
7  7
8-CC=cc 8-CC=cc
9-CFLAGS= -g -I../lib -I. -L../lib -L. 9-CFLAGS= -g -I../lib -I. -L../lib -L.
10+CFLAGS+= -I./lib 10+CFLAGS+= -I./lib
11  11
12 SRC = README Makefile */*.c */*.h */*.tbl */Makefile */README 12 SRC = README Makefile */*.c */*.h */*.tbl */Makefile */README
13 OBJS = big2jis/b2j-util.o big2jis/b2j_table.o \ 13 OBJS = big2jis/b2j-util.o big2jis/b2j_table.o \
14@@ -12,37 +10,43 @@ 14@@ -12,37 +10,43 @@
@@ -16,29 +16,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/30 0 @@ -16,29 +16,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/30 0
16 lib/lang-util.o lib/cn-util.o \ 16 lib/lang-util.o lib/cn-util.o \
17 lib/py-tbl.o lib/uzpj-tbl.o lib/uzpj-util.o \ 17 lib/py-tbl.o lib/uzpj-tbl.o lib/uzpj-util.o \
18- hz2gb.o gb2hz.o SINO.o jp-util2.o 18- hz2gb.o gb2hz.o SINO.o jp-util2.o
19+ lib/hz2gb.o lib/gb2hz.o lib/SINO.o lib/jp-util.o 19+ lib/hz2gb.o lib/gb2hz.o lib/SINO.o lib/jp-util.o
20  20
21-all: makeall libcn2jp.a 21-all: makeall libcn2jp.a
22+PROG = big2jis/b2j jis2big/j2b \ 22+PROG = big2jis/b2j jis2big/j2b \
23+ big2gb/b2g gb2big/g2b \ 23+ big2gb/b2g gb2big/g2b \
24+ gb2jis/g2j jis2gb/j2g 24+ gb2jis/g2j jis2gb/j2g
25+ 25+
26+LIB = libcn2jp.a 26+LIB = libcn2jp.a
27+ 27+
28+install: 28+install:
29+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib 29+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) ${DESTDIR}$(PREFIX)/lib
30+ for i in $(PROG);do \ 30+ for i in $(PROG);do \
31+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i $(PREFIX)/bin; \ 31+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i ${DESTDIR}$(PREFIX)/bin; \
32+ done 32+ done
33+ 33+
34+all: clean mktable $(LIB) makeall 34+all: clean mktable $(LIB) makeall
35+ 35+
36+mktable: 36+mktable:
37+ cd table;make 37+ cd table;make
38+ ln -s table/mktable mktable 38+ ln -s table/mktable mktable
39+ ln -s table/mktbl2c mktbl2c 39+ ln -s table/mktbl2c mktbl2c
40+ cd big2jis;../mktable big2jis.tbl;../mktbl2c big2jis.t b2j > b2j_table.c 40+ cd big2jis;../mktable big2jis.tbl;../mktbl2c big2jis.t b2j > b2j_table.c
41+ cd jis2big;../mktable jis2big.tbl;../mktbl2c jis2big.t j2b > j2b_table.c 41+ cd jis2big;../mktable jis2big.tbl;../mktbl2c jis2big.t j2b > j2b_table.c
42+ cd big2gb;../mktable big2gb.tbl;../mktbl2c big2gb.t b2g > b2g_table.c 42+ cd big2gb;../mktable big2gb.tbl;../mktbl2c big2gb.t b2g > b2g_table.c
43+ cd gb2big;../mktable gb2big.tbl;../mktbl2c gb2big.t g2b > g2b_table.c 43+ cd gb2big;../mktable gb2big.tbl;../mktbl2c gb2big.t g2b > g2b_table.c
44+ cd gb2jis;../mktable gb2jis.tbl;../mktbl2c gb2jis.t g2j > g2j_table.c 44+ cd gb2jis;../mktable gb2jis.tbl;../mktbl2c gb2jis.t g2j > g2j_table.c