Bump ABI for SCIM, new dependency on libltdl.

23 files changed, 52 insertions, 45 deletions

diff --git a/inputmethod/novel-pinyin/Makefile b/inputmethod/novel-pinyin/Makefile
index 7a56acde3bf..fe2339c7d2e 100644
--- a/inputmethod/novel-pinyin/Makefile
+++ b/inputmethod/novel-pinyin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2011/11/01 06:01:53 sbd Exp $
+# $NetBSD: Makefile,v 1.11 2011/11/13 07:57:58 obache Exp $
 
 DISTNAME=	novel-pinyin-0.2.5
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=novel-pinyin/}
 
diff --git a/inputmethod/scim-anthy/Makefile b/inputmethod/scim-anthy/Makefile
index e3070e9921e..53e1e5e5d49 100644
--- a/inputmethod/scim-anthy/Makefile
+++ b/inputmethod/scim-anthy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:53 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-anthy-1.2.7
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/37309/}
 
diff --git a/inputmethod/scim-array/Makefile b/inputmethod/scim-array/Makefile
index 40f3c61f84c..f89da13701b 100644
--- a/inputmethod/scim-array/Makefile
+++ b/inputmethod/scim-array/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:53 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=	scim-array-1.0.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://of.openfoundry.org/download/scimarray/1.0.1/
 
diff --git a/inputmethod/scim-bridge/Makefile b/inputmethod/scim-bridge/Makefile
index ca76e34e243..bfb8791c7f1 100644
--- a/inputmethod/scim-bridge/Makefile
+++ b/inputmethod/scim-bridge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:53 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=	scim-bridge-0.4.16
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
@@ -26,5 +26,10 @@ CONFIGURE_ARGS+=	--disable-tests
 
 CHECK_PORTABILITY_SKIP=	tests/*
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-configure
+SUBST_FILES.prefix=	common/scim-bridge-path.c
+SUBST_VARS.prefix=	PREFIX
+
 .include "../../inputmethod/scim/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/scim-bridge/distinfo b/inputmethod/scim-bridge/distinfo
index fcdbe292074..3249de630e1 100644
--- a/inputmethod/scim-bridge/distinfo
+++ b/inputmethod/scim-bridge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/11/26 12:30:12 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/11/13 07:57:56 obache Exp $
 
 SHA1 (scim-bridge-0.4.16.tar.gz) = 6a7a714592dbecc9a1f44794f37319bafe2bdfae
 RMD160 (scim-bridge-0.4.16.tar.gz) = 37aed056fb880358b013f104f08b2e58c3de4188
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = cc87a5c24af8c066482d164b2805602ed90e2acb
 SHA1 (patch-ae) = 2e8f264da95760b90d40355202fe21b81e0f12c8
 SHA1 (patch-af) = 3db943f7180838a475d4a0c2fca9c52d6dc3cd43
 SHA1 (patch-ag) = 45915bc63fd6228fe2033336fe3313f7ce639ef6
+SHA1 (patch-ah) = 9a05e6af7779314557a01fcb1b8e0c435d1dfddf
diff --git a/inputmethod/scim-canna/Makefile b/inputmethod/scim-canna/Makefile
index 552b7884d22..aafebf7c8f9 100644
--- a/inputmethod/scim-canna/Makefile
+++ b/inputmethod/scim-canna/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-canna-1.0.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29155/}
 
diff --git a/inputmethod/scim-ccinput/Makefile b/inputmethod/scim-ccinput/Makefile
index dc6300e3d82..288f00e2ded 100644
--- a/inputmethod/scim-ccinput/Makefile
+++ b/inputmethod/scim-ccinput/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-ccinput-0.3.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod chinese
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/inputmethod/scim-chewing/Makefile b/inputmethod/scim-chewing/Makefile
index bf34347589f..26928ea21af 100644
--- a/inputmethod/scim-chewing/Makefile
+++ b/inputmethod/scim-chewing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-chewing-0.3.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://chewing.csie.net/download/scim/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/inputmethod/scim-fcitx/Makefile b/inputmethod/scim-fcitx/Makefile
index 1780caae96b..74f46386036 100644
--- a/inputmethod/scim-fcitx/Makefile
+++ b/inputmethod/scim-fcitx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-fcitx.3.1.1
 PKGNAME=		scim-fcitx-3.1.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/inputmethod/scim-hangul/Makefile b/inputmethod/scim-hangul/Makefile
index 689c5ca5633..12d087b352b 100644
--- a/inputmethod/scim-hangul/Makefile
+++ b/inputmethod/scim-hangul/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/10 10:57:54 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:56 obache Exp $
 #
 
 DISTNAME=		scim-hangul-0.3.2
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		inputmethod korean
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-input-pad/Makefile b/inputmethod/scim-input-pad/Makefile
index 4d9905ae095..fba9dc66c74 100644
--- a/inputmethod/scim-input-pad/Makefile
+++ b/inputmethod/scim-input-pad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=	scim-input-pad-0.1.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-m17n/Makefile b/inputmethod/scim-m17n/Makefile
index 228288e8642..005e9cfe8ed 100644
--- a/inputmethod/scim-m17n/Makefile
+++ b/inputmethod/scim-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-m17n-0.2.3
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-pinyin/Makefile b/inputmethod/scim-pinyin/Makefile
index 5f79dbbe8b8..34c19e825b5 100644
--- a/inputmethod/scim-pinyin/Makefile
+++ b/inputmethod/scim-pinyin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-pinyin-0.5.91
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-prime/Makefile b/inputmethod/scim-prime/Makefile
index 2ec09143777..bc09c862d02 100644
--- a/inputmethod/scim-prime/Makefile
+++ b/inputmethod/scim-prime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-prime-1.0.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29156/}
 
diff --git a/inputmethod/scim-python/Makefile b/inputmethod/scim-python/Makefile
index 8d6b7b3cc62..03a9cc20792 100644
--- a/inputmethod/scim-python/Makefile
+++ b/inputmethod/scim-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/11/01 06:01:54 sbd Exp $
+# $NetBSD: Makefile,v 1.7 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=	scim-python-0.1.13rc1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	inputmethod python
 MASTER_SITES=	http://scim-python.googlecode.com/files/
 DISTFILES=	${DEFAULT_DISTFILES} ${DBTAR}
diff --git a/inputmethod/scim-sinhala/Makefile b/inputmethod/scim-sinhala/Makefile
index 5152bcef7db..4fe26c6f049 100644
--- a/inputmethod/scim-sinhala/Makefile
+++ b/inputmethod/scim-sinhala/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-sinhala-0.1.0
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/16666/}
 
diff --git a/inputmethod/scim-skk/Makefile b/inputmethod/scim-skk/Makefile
index 794024c5d58..07ffb4e5a1f 100644
--- a/inputmethod/scim-skk/Makefile
+++ b/inputmethod/scim-skk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-skk-0.5.2
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/18121/}
 
diff --git a/inputmethod/scim-tables/Makefile b/inputmethod/scim-tables/Makefile
index db3131b4c01..81c39338d53 100644
--- a/inputmethod/scim-tables/Makefile
+++ b/inputmethod/scim-tables/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-tables-0.5.10
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-thai/Makefile b/inputmethod/scim-thai/Makefile
index 4a912689191..aa3ec888b7f 100644
--- a/inputmethod/scim-thai/Makefile
+++ b/inputmethod/scim-thai/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=	scim-thai-0.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/ \
 		ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
diff --git a/inputmethod/scim-tomoe/Makefile b/inputmethod/scim-tomoe/Makefile
index 260b847fea5..51b6a094941 100644
--- a/inputmethod/scim-tomoe/Makefile
+++ b/inputmethod/scim-tomoe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2011/11/13 07:57:57 obache Exp $
 #
 
 DISTNAME=		scim-tomoe-0.6.0
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tomoe/}
 
diff --git a/inputmethod/scim-uim/Makefile b/inputmethod/scim-uim/Makefile
index 272299b16f7..b68c1f013f5 100644
--- a/inputmethod/scim-uim/Makefile
+++ b/inputmethod/scim-uim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/13 07:57:58 obache Exp $
 #
 
 DISTNAME=		scim-uim-0.2.0
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-unikey/Makefile b/inputmethod/scim-unikey/Makefile
index 53274e3bb23..0ddbc41324b 100644
--- a/inputmethod/scim-unikey/Makefile
+++ b/inputmethod/scim-unikey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/13 07:57:58 obache Exp $
 #
 
 DISTNAME=	scim-unikey-0.3.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://scim-unikey.googlecode.com/files/
 
diff --git a/inputmethod/scim/buildlink3.mk b/inputmethod/scim/buildlink3.mk
index e087cf3751b..654b764aceb 100644
--- a/inputmethod/scim/buildlink3.mk
+++ b/inputmethod/scim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2011/11/01 06:01:55 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2011/11/13 07:57:56 obache Exp $
 
 BUILDLINK_TREE+=	scim
 
@@ -6,10 +6,11 @@ BUILDLINK_TREE+=	scim
 SCIM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.scim+=	scim>=1.4.7
-BUILDLINK_ABI_DEPENDS.scim?=	scim>=1.4.9nb6
+BUILDLINK_ABI_DEPENDS.scim?=	scim>=1.4.11
 BUILDLINK_PKGSRCDIR.scim?=	../../inputmethod/scim
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 
 .if defined(USE_SCIM_GTKUTILS) && !empty(USE_SCIM_GTKUTILS:M[Yy][Ee][Ss])
 .  include "../../x11/gtk2/buildlink3.mk"