Tue Nov 24 11:23:34 2009 UTC ()
* Change to depend on libchewing02
* relax build dependency from db3 to db2-4.
* add DESTDIR support

Bump PKGREVISION.


(obache)
diff -r1.25 -r1.26 pkgsrc/inputmethod/xcin/Makefile
diff -r1.6 -r1.7 pkgsrc/inputmethod/xcin/distinfo
diff -r1.2 -r1.3 pkgsrc/inputmethod/xcin/patches/patch-aa
diff -r0 -r1.1 pkgsrc/inputmethod/xcin/patches/patch-aj
cvs diff -r1.25 -r1.26 pkgsrc/inputmethod/xcin/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/Makefile 2009/08/18 15:51:17 1.25
+++ pkgsrc/inputmethod/xcin/Makefile 2009/11/24 11:23:34 1.26
@@ -1,61 +1,69 @@ @@ -1,61 +1,69 @@
1# $NetBSD: Makefile,v 1.25 2009/08/18 15:51:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.26 2009/11/24 11:23:34 obache Exp $
2# 2#
3 3
4DISTNAME= xcin-2.5.3.pre2 4DISTNAME= xcin-2.5.3.pre2
5PKGNAME= xcin-2.5.3rc2 5PKGNAME= xcin-2.5.3rc2
6PKGREVISION= 6 6PKGREVISION= 7
7CATEGORIES= chinese x11 7CATEGORIES= chinese x11
8MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/ 8MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
9 9
10MAINTAINER= rxg@NetBSD.org 10MAINTAINER= rxg@NetBSD.org
11HOMEPAGE= http://xcin.linux.org.tw/ 11HOMEPAGE= http://xcin.linux.org.tw/
12COMMENT= Chinese XIM server 12COMMENT= Chinese XIM server
 13LICENSE= gnu-gpl-v2
 14
 15PKG_DESTDIR_SUPPORT= user-destdir
13 16
14MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
15 18
16WRKSRC= ${WRKDIR}/xcin 19WRKSRC= ${WRKDIR}/xcin
17USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
18USE_X11BASE= yes 21USE_X11BASE= yes
19USE_LIBTOOL= yes 22USE_LIBTOOL= yes
20USE_TOOLS+= msgfmt pax perl:run 23USE_TOOLS+= msgfmt pax perl:run
21 24
22GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
24CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib 27CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib
25CONFIGURE_ARGS+= --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3 28CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/{BDB_TYPE}
26 29
27.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
28 31
29INSTALLATION_DIRS= share/doc/xcin 32INSTALLATION_DIRS= share/doc/xcin
30 33
31EGDIR= ${PREFIX}/share/examples/xcin 34EGDIR= ${PREFIX}/share/examples/xcin
32CONF_FILES= ${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc 35CONF_FILES= ${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc
33 36
34.if ${OPSYS} == "NetBSD" 37.if ${OPSYS} == "NetBSD"
35EUC_LOCALE= euccn 38EUC_LOCALE= euccn
36.else 39.else
37EUC_LOCALE= euc 40EUC_LOCALE= euc
38.endif 41.endif
39 42
40PLIST_SUBST+= EUC_LOCALE=${EUC_LOCALE} 43PLIST_SUBST+= EUC_LOCALE=${EUC_LOCALE}
41 44
42post-extract: 45post-extract:
43 ${CP} ${FILESDIR}/xcinrc.DRAGONFLY ${WRKSRC}/etc 46 ${CP} ${FILESDIR}/xcinrc.DRAGONFLY ${WRKSRC}/etc
44 47
45post-install: 48post-install:
46 cd ${WRKSRC}/doc && pax -rw \ 49 cd ${WRKSRC}/doc && pax -rw \
47 -s ',^\./man$$,,' -s ',^\./man/.*,,' \ 50 -s ',^\./man$$,,' -s ',^\./man/.*,,' \
48 . ${PREFIX}/share/doc/xcin 51 . ${DESTDIR}${PREFIX}/share/doc/xcin
 52
 53INSTALL_MAKE_FLAGS+= program_prefix=${DESTDIR}
49 54
50BUILDLINK_DEPMETHOD.libXt?= build 55BUILDLINK_DEPMETHOD.libXt?= build
51 56
 57BDB_ACCEPTED= db2 db3 db4
 58
52.include "../../converters/libiconv/buildlink3.mk" 59.include "../../converters/libiconv/buildlink3.mk"
53.include "../../databases/db3/buildlink3.mk" 
54.include "../../devel/gettext-lib/buildlink3.mk" 60.include "../../devel/gettext-lib/buildlink3.mk"
55.include "../../inputmethod/libchewing/buildlink3.mk" 61.include "../../inputmethod/libchewing02/buildlink3.mk"
56.include "../../inputmethod/libtabe/buildlink3.mk" 62.include "../../inputmethod/libtabe/buildlink3.mk"
57.include "../../x11/libX11/buildlink3.mk" 63.include "../../x11/libX11/buildlink3.mk"
58.include "../../x11/libXext/buildlink3.mk" 64.include "../../x11/libXext/buildlink3.mk"
59.include "../../x11/libXt/buildlink3.mk" 65.include "../../x11/libXt/buildlink3.mk"
60.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
 67.include "../../mk/bdb.buildlink3.mk"
 68BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
61.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/inputmethod/xcin/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/distinfo 2006/04/28 18:12:29 1.6
+++ pkgsrc/inputmethod/xcin/distinfo 2009/11/24 11:23:34 1.7
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.6 2006/04/28 18:12:29 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2009/11/24 11:23:34 obache Exp $
2 2
3SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795 3SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
4RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865 4RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
5Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes 5Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes
6SHA1 (patch-aa) = f08a273843fd6dc50f71c815f0cd9c8c8c0cdc40 6SHA1 (patch-aa) = 9d0631ee59d376515cf260537f664dda9bd14a83
7SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a 7SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a
8SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f 8SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f
9SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018 9SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018
10SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689 10SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689
11SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2 11SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
12SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c 12SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c
13SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf 13SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
14SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6 14SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6
 15SHA1 (patch-aj) = 074e2893c3c06253034ce4d1e85679e71edd483e
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/xcin/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/patches/patch-aa 2006/01/28 03:03:11 1.2
+++ pkgsrc/inputmethod/xcin/patches/patch-aa 2009/11/24 11:23:34 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.2 2006/01/28 03:03:11 rxg Exp $ 1$NetBSD: patch-aa,v 1.3 2009/11/24 11:23:34 obache Exp $
2 2
3--- etc/Makefile.in.orig 2001-11-28 22:39:03.000000000 +0800 3--- etc/Makefile.in.orig 2001-11-28 22:39:03.000000000 +0800
4+++ etc/Makefile.in 4+++ etc/Makefile.in
5@@ -22,9 +22,8 @@ xcinrc: 5@@ -22,9 +22,8 @@ xcinrc:
6 .PHONY: install clean distclean subsys 6 .PHONY: install clean distclean subsys
7  7
8 install: all 8 install: all
9- if [ ! -d "$(xcin_rcp)" ]; then $(INSTALL) -d $(xcin_rcp); fi 9- if [ ! -d "$(xcin_rcp)" ]; then $(INSTALL) -d $(xcin_rcp); fi
10- if [ -f $(xcin_rcp)/xcinrc ]; then mv $(xcin_rcp)/xcinrc $(xcin_rcp)/xcinrc.old; fi 10- if [ -f $(xcin_rcp)/xcinrc ]; then mv $(xcin_rcp)/xcinrc $(xcin_rcp)/xcinrc.old; fi
11- $(INSTALL_DATA) xcinrc $(xcin_rcp) 11- $(INSTALL_DATA) xcinrc $(xcin_rcp)
12+ if [ ! -d "$(prefix)/share/examples/xcin" ]; then $(INSTALL) -d $(prefix)/share/examples/xcin; fi 12+ if [ ! -d "$(program_prefix)$(prefix)/share/examples/xcin" ]; then $(INSTALL) -d $(program_prefix)$(prefix)/share/examples/xcin; fi
13+ $(INSTALL_DATA) xcinrc $(prefix)/share/examples/xcin 13+ $(INSTALL_DATA) xcinrc $(program_prefix)$(prefix)/share/examples/xcin
14  14
15 clean: 15 clean:
16 rm -f xcinrc 16 rm -f xcinrc
File Added: pkgsrc/inputmethod/xcin/patches/patch-aj
$NetBSD: patch-aj,v 1.1 2009/11/24 11:23:34 obache Exp $

for process jyutping.cin.

--- src/util/cin2tab/cin2tab.c.orig	2001-10-04 16:39:49.000000000 +0000
+++ src/util/cin2tab/cin2tab.c
@@ -74,12 +74,12 @@ static struct cin cinfunc[] = {
 int
 cmd_arg(char *cmd, int cmdlen, ...)
 {
-    char line[256], *s=line, *arg;
+    char line[512], *s=line, *arg;
     int arglen, n_read=1;
     va_list list;
 
     va_start(list, cmdlen);
-    if (! get_line(line, 256, cintab.fr, &(cintab.lineno), "#\n"))
+    if (! get_line(line, 512, cintab.fr, &(cintab.lineno), "#\n"))
 	return 0;
 
     cmd[0] = '\0';