Wed Jun 2 12:34:02 2010 UTC ()
Fix building with db5; revision bump for db4 update; clean-up


(adam)
diff -r1.19 -r1.20 pkgsrc/inputmethod/libtabe/Makefile
diff -r1.5 -r1.6 pkgsrc/inputmethod/libtabe/distinfo
diff -r1.4 -r1.5 pkgsrc/inputmethod/libtabe/patches/patch-aa
cvs diff -r1.19 -r1.20 pkgsrc/inputmethod/libtabe/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/libtabe/Makefile 2009/11/25 20:38:45 1.19
+++ pkgsrc/inputmethod/libtabe/Makefile 2010/06/02 12:34:02 1.20
@@ -1,46 +1,45 @@ @@ -1,46 +1,45 @@
1# $NetBSD: Makefile,v 1.19 2009/11/25 20:38:45 joerg Exp $ 1# $NetBSD: Makefile,v 1.20 2010/06/02 12:34:02 adam Exp $
2# 
3 2
4DISTNAME= libtabe-0.2.6 3DISTNAME= libtabe-0.2.6
 4PKGREVISION= 1
5CATEGORIES= chinese inputmethod 5CATEGORIES= chinese inputmethod
6MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ 6MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/
7 7
8MAINTAINER= rxg@NetBSD.org 8MAINTAINER= rxg@NetBSD.org
9HOMEPAGE= http://libtabe.sourceforge.net/ 9HOMEPAGE= http://libtabe.sourceforge.net/
10COMMENT= Library for Chinese language processing 10COMMENT= Library for Chinese language processing
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16 16
 17BDB_ACCEPTED= db2 db3 db4 db5
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18 
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/${BDB_TYPE} 20CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/${BDB_TYPE}
21CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib 21CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib
22 22
23INSTALL_MAKE_FLAGS+= program_prefix=${DESTDIR} 23INSTALL_MAKE_FLAGS+= program_prefix=${DESTDIR}
24 24
25INSTALLATION_DIRS+= share/doc/tabe 25INSTALLATION_DIRS+= share/doc/tabe
26 26
27post-install: 27post-install:
28 ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/tabe 28 ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/tabe
29 ${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README \ 29 ${INSTALL_DATA} ${WRKSRC}/src/supports/bims/README \
30 ${DESTDIR}${PREFIX}/share/doc/tabe/README.bims 30 ${DESTDIR}${PREFIX}/share/doc/tabe/README.bims
31 ${INSTALL_DATA} ${WRKSRC}/tsi-src/README \ 31 ${INSTALL_DATA} ${WRKSRC}/tsi-src/README \
32 ${DESTDIR}${PREFIX}/share/doc/tabe/README.tsi 32 ${DESTDIR}${PREFIX}/share/doc/tabe/README.tsi
33 33
34BUILDLINK_DEPMETHOD.libXt?= build 34BUILDLINK_DEPMETHOD.libXt?= build
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38.if ${X11_TYPE} == "modular" 38.if ${X11_TYPE} == "modular"
39CONFIGURE_ARGS+= --x-includes=${PREFIX:Q}/include 39CONFIGURE_ARGS+= --x-includes=${PREFIX}/include
40.endif 40.endif
41 41
42.include "../../x11/libX11/buildlink3.mk" 42.include "../../x11/libX11/buildlink3.mk"
43.include "../../x11/libXt/buildlink3.mk" 43.include "../../x11/libXt/buildlink3.mk"
44BDB_ACCEPTED= db2 db3 db4 
45.include "../../mk/bdb.buildlink3.mk" 44.include "../../mk/bdb.buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/inputmethod/libtabe/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/libtabe/distinfo 2009/11/24 11:15:14 1.5
+++ pkgsrc/inputmethod/libtabe/distinfo 2010/06/02 12:34:02 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2009/11/24 11:15:14 obache Exp $ 1$NetBSD: distinfo,v 1.6 2010/06/02 12:34:02 adam Exp $
2 2
3SHA1 (libtabe-0.2.6.tar.gz) = d0c6a8a82e22567fa47e897ba7141414c9b71431 3SHA1 (libtabe-0.2.6.tar.gz) = d0c6a8a82e22567fa47e897ba7141414c9b71431
4RMD160 (libtabe-0.2.6.tar.gz) = 0d5d6d5cadb8d099ec77a28d54a0366efacc9ffd 4RMD160 (libtabe-0.2.6.tar.gz) = 0d5d6d5cadb8d099ec77a28d54a0366efacc9ffd
5Size (libtabe-0.2.6.tar.gz) = 1788455 bytes 5Size (libtabe-0.2.6.tar.gz) = 1788455 bytes
6SHA1 (patch-aa) = 08687575e08a088a2b8d6325b6bafd698daf6161 6SHA1 (patch-aa) = d4ac9101ce7352a9f440638e6ab81c1017df71ce
7SHA1 (patch-ad) = 474f0ff1a02d949d66f2802c25b81ed1722041d1 7SHA1 (patch-ad) = 474f0ff1a02d949d66f2802c25b81ed1722041d1
8SHA1 (patch-ae) = 52985fda50a11adce231122c87ddb060773a7707 8SHA1 (patch-ae) = 52985fda50a11adce231122c87ddb060773a7707
9SHA1 (patch-af) = 2b5efdddc1e2e4b40c8a8f1d5f9b66df004688cc 9SHA1 (patch-af) = 2b5efdddc1e2e4b40c8a8f1d5f9b66df004688cc
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/libtabe/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/libtabe/patches/patch-aa 2009/11/24 11:15:14 1.4
+++ pkgsrc/inputmethod/libtabe/patches/patch-aa 2010/06/02 12:34:02 1.5
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-aa,v 1.4 2009/11/24 11:15:14 obache Exp $ 1$NetBSD: patch-aa,v 1.5 2010/06/02 12:34:02 adam Exp $
2 2
3--- configure.orig 2004-09-20 06:16:48.000000000 +0000 3--- configure.orig 2004-09-20 06:16:48.000000000 +0000
4+++ configure 4+++ configure
 5@@ -18905,7 +18905,7 @@ OLD_LIBS=$LIBS
 6 CPPFLAGS="$OLD_CPPFLAGS $with_db_inc"
 7 LDFLAGS="$OLD_LDFLAGS $test_db_lib"
 8
 9-for dbname in $with_db_name db db2 db3 db4
 10+for dbname in $with_db_name db db2 db3 db4 db5
 11 do
 12 as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_open" | $as_tr_sh`
 13 echo "$as_me:$LINENO: checking for db_open in -l$dbname" >&5
5@@ -19253,7 +19253,9 @@ errno = db_open("foo.db", DB_BTREE, DB_C 14@@ -19253,7 +19253,9 @@ errno = db_open("foo.db", DB_BTREE, DB_C
6 #endif 15 #endif
7 if(errno) return errno; 16 if(errno) return errno;
8  17
9-#if DB_VERSION >= 303011 18-#if DB_VERSION >= 303011
10+#if DB_VERSION >= 403000 19+#if DB_VERSION >= 403000
11+errno = dbp->stat(dbp, NULL, &sp, 0); 20+errno = dbp->stat(dbp, NULL, &sp, 0);
12+#elif DB_VERSION >= 303011 21+#elif DB_VERSION >= 303011
13 errno = dbp->stat(dbp, &sp, 0); 22 errno = dbp->stat(dbp, &sp, 0);
14 #else 23 #else
15 errno = dbp->stat(dbp, &sp, NULL, 0); 24 errno = dbp->stat(dbp, &sp, NULL, 0);