diff options
| author | adam <adam> | 2010-06-02 12:34:02 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-06-02 12:34:02 +0000 |
| commit | 4abb449588964b1b9119a1bc2c388773fef5dcb1 (patch) | |
| tree | 919c703121f673c9e3866017cfb25505893b555f /inputmethod/libtabe | |
| parent | c772fb56e4eea2d52424ebe5551265edca2cb22a (diff) | |
| download | pkgsrc-4abb449588964b1b9119a1bc2c388773fef5dcb1.tar.gz | |
Fix building with db5; revision bump for db4 update; clean-up
Diffstat (limited to 'inputmethod/libtabe')
| -rw-r--r-- | inputmethod/libtabe/Makefile | 9 | ||||
| -rw-r--r-- | inputmethod/libtabe/distinfo | 4 | ||||
| -rw-r--r-- | inputmethod/libtabe/patches/patch-aa | 11 |
3 files changed, 16 insertions, 8 deletions
diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile index 3cfca20c40f..faf532b9c87 100644 --- a/inputmethod/libtabe/Makefile +++ b/inputmethod/libtabe/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2009/11/25 20:38:45 joerg Exp $ -# +# $NetBSD: Makefile,v 1.20 2010/06/02 12:34:02 adam Exp $ DISTNAME= libtabe-0.2.6 +PKGREVISION= 1 CATEGORIES= chinese inputmethod MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ @@ -14,8 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no +BDB_ACCEPTED= db2 db3 db4 db5 USE_LIBTOOL= yes - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-db-inc=${BDBBASE}/include/${BDB_TYPE} CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib @@ -36,11 +36,10 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../mk/bsd.prefs.mk" .if ${X11_TYPE} == "modular" -CONFIGURE_ARGS+= --x-includes=${PREFIX:Q}/include +CONFIGURE_ARGS+= --x-includes=${PREFIX}/include .endif .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -BDB_ACCEPTED= db2 db3 db4 .include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/libtabe/distinfo b/inputmethod/libtabe/distinfo index 66315bb4a9b..47a0de368d2 100644 --- a/inputmethod/libtabe/distinfo +++ b/inputmethod/libtabe/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2009/11/24 11:15:14 obache Exp $ +$NetBSD: distinfo,v 1.6 2010/06/02 12:34:02 adam Exp $ SHA1 (libtabe-0.2.6.tar.gz) = d0c6a8a82e22567fa47e897ba7141414c9b71431 RMD160 (libtabe-0.2.6.tar.gz) = 0d5d6d5cadb8d099ec77a28d54a0366efacc9ffd Size (libtabe-0.2.6.tar.gz) = 1788455 bytes -SHA1 (patch-aa) = 08687575e08a088a2b8d6325b6bafd698daf6161 +SHA1 (patch-aa) = d4ac9101ce7352a9f440638e6ab81c1017df71ce SHA1 (patch-ad) = 474f0ff1a02d949d66f2802c25b81ed1722041d1 SHA1 (patch-ae) = 52985fda50a11adce231122c87ddb060773a7707 SHA1 (patch-af) = 2b5efdddc1e2e4b40c8a8f1d5f9b66df004688cc diff --git a/inputmethod/libtabe/patches/patch-aa b/inputmethod/libtabe/patches/patch-aa index 594d8220deb..9d8496f9452 100644 --- a/inputmethod/libtabe/patches/patch-aa +++ b/inputmethod/libtabe/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.4 2009/11/24 11:15:14 obache Exp $ +$NetBSD: patch-aa,v 1.5 2010/06/02 12:34:02 adam Exp $ --- configure.orig 2004-09-20 06:16:48.000000000 +0000 +++ configure +@@ -18905,7 +18905,7 @@ OLD_LIBS=$LIBS + CPPFLAGS="$OLD_CPPFLAGS $with_db_inc" + LDFLAGS="$OLD_LDFLAGS $test_db_lib" + +-for dbname in $with_db_name db db2 db3 db4 ++for dbname in $with_db_name db db2 db3 db4 db5 + do + as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_open" | $as_tr_sh` + echo "$as_me:$LINENO: checking for db_open in -l$dbname" >&5 @@ -19253,7 +19253,9 @@ errno = db_open("foo.db", DB_BTREE, DB_C #endif if(errno) return errno; |