* Change to depend on libchewing02

* relax build dependency from db3 to db2-4.
* add DESTDIR support

Bump PKGREVISION.

4 files changed, 42 insertions, 12 deletions

diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile
index 9c05deeadba..8918ac47a90 100644
--- a/inputmethod/xcin/Makefile
+++ b/inputmethod/xcin/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2009/08/18 15:51:17 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/11/24 11:23:34 obache Exp $
 #
 
 DISTNAME=	xcin-2.5.3.pre2
 PKGNAME=	xcin-2.5.3rc2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://xcin.linux.org.tw/
 COMMENT=	Chinese XIM server
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=	no
 
@@ -21,8 +24,8 @@ USE_TOOLS+=		msgfmt pax perl:run
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db3}/lib
-CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3
+CONFIGURE_ARGS+=	--with-db-lib=${BDBBASE}/lib
+CONFIGURE_ARGS+=	--with-db-inc=${BDBBASE}/include/{BDB_TYPE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,17 +48,22 @@ post-extract:
 post-install:
 	cd ${WRKSRC}/doc && pax -rw	\
 		-s ',^\./man$$,,' -s ',^\./man/.*,,'	\
-		. ${PREFIX}/share/doc/xcin
+		. ${DESTDIR}${PREFIX}/share/doc/xcin
+
+INSTALL_MAKE_FLAGS+=	program_prefix=${DESTDIR}
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+BDB_ACCEPTED=	db2 db3 db4
+
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../inputmethod/libchewing/buildlink3.mk"
+.include "../../inputmethod/libchewing02/buildlink3.mk"
 .include "../../inputmethod/libtabe/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/xcin/distinfo b/inputmethod/xcin/distinfo
index 0734b44ead9..582a9e086c0 100644
--- a/inputmethod/xcin/distinfo
+++ b/inputmethod/xcin/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/04/28 18:12:29 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/11/24 11:23:34 obache Exp $
 
 SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
 RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
 Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes
-SHA1 (patch-aa) = f08a273843fd6dc50f71c815f0cd9c8c8c0cdc40
+SHA1 (patch-aa) = 9d0631ee59d376515cf260537f664dda9bd14a83
 SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a
 SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f
 SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
 SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c
 SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
 SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6
+SHA1 (patch-aj) = 074e2893c3c06253034ce4d1e85679e71edd483e
diff --git a/inputmethod/xcin/patches/patch-aa b/inputmethod/xcin/patches/patch-aa
index b150a5eb4eb..634c1a878b2 100644
--- a/inputmethod/xcin/patches/patch-aa
+++ b/inputmethod/xcin/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/01/28 03:03:11 rxg Exp $
+$NetBSD: patch-aa,v 1.3 2009/11/24 11:23:34 obache Exp $
 
 --- etc/Makefile.in.orig	2001-11-28 22:39:03.000000000 +0800
 +++ etc/Makefile.in
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.2 2006/01/28 03:03:11 rxg Exp $
 -	if [ ! -d "$(xcin_rcp)" ];  then $(INSTALL) -d $(xcin_rcp);  fi
 -	if [ -f $(xcin_rcp)/xcinrc ]; then mv $(xcin_rcp)/xcinrc $(xcin_rcp)/xcinrc.old; fi
 -	$(INSTALL_DATA) xcinrc $(xcin_rcp)
-+	if [ ! -d "$(prefix)/share/examples/xcin" ];  then $(INSTALL) -d $(prefix)/share/examples/xcin;  fi
-+	$(INSTALL_DATA) xcinrc $(prefix)/share/examples/xcin
++	if [ ! -d "$(program_prefix)$(prefix)/share/examples/xcin" ];  then $(INSTALL) -d $(program_prefix)$(prefix)/share/examples/xcin;  fi
++	$(INSTALL_DATA) xcinrc $(program_prefix)$(prefix)/share/examples/xcin
  
  clean:
  	rm -f xcinrc
diff --git a/inputmethod/xcin/patches/patch-aj b/inputmethod/xcin/patches/patch-aj
new file mode 100644
index 00000000000..0fd032fce96
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-aj
@@ -0,0 +1,21 @@
+$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';