[pkgsrc/trunk]: pkgsrc/inputmethod Fix building with db5; revision bump for d...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/inputmethod Fix building with db5; revision bump for d...
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:28:36 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5477f3c9eb33
branches:  trunk
changeset: 576124:5477f3c9eb33
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 02 12:34:02 2010 +0000

description:
Fix building with db5; revision bump for db4 update; clean-up

diffstat:

 inputmethod/libtabe/Makefile         |   9 ++++-----
 inputmethod/libtabe/distinfo         |   4 ++--
 inputmethod/libtabe/patches/patch-aa |  11 ++++++++++-
 inputmethod/novel-pinyin/Makefile    |  19 ++++++++++---------
 inputmethod/xcin/Makefile            |  20 +++++++++-----------
 inputmethod/xcin/PLIST               |   4 ++--
 6 files changed, 37 insertions(+), 30 deletions(-)

diffs (182 lines):

diff -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/libtabe/Makefile
--- a/inputmethod/libtabe/Makefile      Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/libtabe/Makefile      Wed Jun 02 12:34:02 2010 +0000
@@ -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 @@
 
 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 @@
 .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 -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/libtabe/distinfo
--- a/inputmethod/libtabe/distinfo      Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/libtabe/distinfo      Wed Jun 02 12:34:02 2010 +0000
@@ -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 -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/libtabe/patches/patch-aa
--- a/inputmethod/libtabe/patches/patch-aa      Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/libtabe/patches/patch-aa      Wed Jun 02 12:34:02 2010 +0000
@@ -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;
diff -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/novel-pinyin/Makefile
--- a/inputmethod/novel-pinyin/Makefile Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/novel-pinyin/Makefile Wed Jun 02 12:34:02 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/12/23 07:43:21 obache Exp $
-#
+# $NetBSD: Makefile,v 1.3 2010/06/02 12:35:44 adam Exp $
 
 DISTNAME=      novel-pinyin-0.2.5
+PKGREVISION=   1
 CATEGORIES=    inputmethod
-MASTER_SITES=  http://downloads.sourceforge.net/project/novel-pinyin/novel-pinyin/0.2.5/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=novel-pinyin/}
 
 MAINTAINER=    obache%NetBSD.org@localhost
 HOMEPAGE=      http://novel-pinyin.sourceforge.net/
@@ -12,17 +12,18 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_LANGUAGES= c c++
-USE_TOOLS+=    intltool pkg-config msgfmt msgmerge xgettext
+BDB_ACCEPTED=          db4 db5
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_TOOLS+=            intltool pkg-config msgfmt msgmerge xgettext
+GNU_CONFIGURE=         yes
 
 USE_SCIM_GTKUTILS=     yes
 
-.include "../../databases/db4/buildlink3.mk"
-BUILDLINK_TRANSFORM+=  l:db:db4
+BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../inputmethod/scim/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/xcin/Makefile
--- a/inputmethod/xcin/Makefile Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/xcin/Makefile Wed Jun 02 12:34:02 2010 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2009/11/24 11:23:34 obache Exp $
-#
+# $NetBSD: Makefile,v 1.27 2010/06/02 12:36:57 adam Exp $
 
 DISTNAME=      xcin-2.5.3.pre2
 PKGNAME=       xcin-2.5.3rc2
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    chinese x11
 MASTER_SITES=  ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
 
@@ -17,15 +16,14 @@
 MAKE_JOBS_SAFE=        no
 
 WRKSRC=                        ${WRKDIR}/xcin
+USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_X11BASE=           yes
-USE_LIBTOOL=           yes
 USE_TOOLS+=            msgfmt pax perl:run
-
+USE_X11BASE=           yes
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-db-lib=${BDBBASE}/lib
-CONFIGURE_ARGS+=       --with-db-inc=${BDBBASE}/include/{BDB_TYPE}
+CONFIGURE_ARGS+=       --with-db-inc=${BDBBASE}/include/${BDB_TYPE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -54,7 +52,8 @@
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
-BDB_ACCEPTED=  db2 db3 db4
+BDB_ACCEPTED=  db2 db3 db4 db5
+BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -63,7 +62,6 @@
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .include "../../mk/bsd.pkg.mk"
diff -r 4db7bb9d6530 -r 5477f3c9eb33 inputmethod/xcin/PLIST
--- a/inputmethod/xcin/PLIST    Wed Jun 02 12:32:18 2010 +0000
+++ b/inputmethod/xcin/PLIST    Wed Jun 02 12:34:02 2010 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:01:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/06/02 12:36:57 adam Exp $
 bin/cin2tab
 bin/xcin
 lib/libxcin.la
+lib/xcin/bimsphone.la
 lib/xcin/chewing.la
-lib/xcin/bimsphone.la
 lib/xcin/gen_inp.la
 lib/xcin/tab/big5/array30.tab
 lib/xcin/tab/big5/bims_pinyin.tab
Prev by Date: [pkgsrc/trunk]: pkgsrc Add gns3
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/safecat Update to 1.13. From the changelog:
Previous by Thread: [pkgsrc/trunk]: pkgsrc Add gns3
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/safecat Update to 1.13. From the changelog:
Indexes:
Home | Main Index | Thread Index | Old Index