Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

34 files changed, 68 insertions, 47 deletions

diff --git a/inputmethod/ami/Makefile b/inputmethod/ami/Makefile
index 278791cd8d7..513a27b4bf4 100644
--- a/inputmethod/ami/Makefile
+++ b/inputmethod/ami/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	ami-1.0.11
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	korean inputmethod
 MASTER_SITES=	http://kldp.net/frs/download.php/942/
 # http://kldp.net/frs/download.php/942/ami-1.2.3.tar.gz
diff --git a/inputmethod/im-ja/Makefile b/inputmethod/im-ja/Makefile
index 5ff44a40597..bd36a049fe3 100644
--- a/inputmethod/im-ja/Makefile
+++ b/inputmethod/im-ja/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 08:18:00 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	im-ja-1.5
+PKGREVISION=	1
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 0176d351907..9113ab33c4b 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=		imhangul_status_applet-0.3
-PKGREVISION=		16
+PKGREVISION=		17
 CATEGORIES=		korean inputmethod
 MASTER_SITES=		http://download.kldp.net/imhangul/imhangul_status_applet/0.3/
 
diff --git a/inputmethod/kasumi/Makefile b/inputmethod/kasumi/Makefile
index 5bf001247b8..78d8a960f64 100644
--- a/inputmethod/kasumi/Makefile
+++ b/inputmethod/kasumi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/05/08 13:33:17 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:48 wiz Exp $
 
 DISTNAME=	kasumi-2.5
+PKGREVISION=	1
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kasumi/41436/}
 
diff --git a/inputmethod/kimera-tomoe-gtk/Makefile b/inputmethod/kimera-tomoe-gtk/Makefile
index 073527a7bee..01efecfedf1 100644
--- a/inputmethod/kimera-tomoe-gtk/Makefile
+++ b/inputmethod/kimera-tomoe-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 08:34:29 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	kimera-tomoe-gtk-0.5
+PKGREVISION=	1
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kimera/24906/}
 
diff --git a/inputmethod/kimera/Makefile b/inputmethod/kimera/Makefile
index 0f2f7cf7931..86dac086fa2 100644
--- a/inputmethod/kimera/Makefile
+++ b/inputmethod/kimera/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 07:46:41 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	kimera-2.11
+PKGREVISION=	1
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kimera/37271/}
 
diff --git a/inputmethod/m17n-im-config/Makefile b/inputmethod/m17n-im-config/Makefile
index 3d92f1906d9..16e9bdfea6c 100644
--- a/inputmethod/m17n-im-config/Makefile
+++ b/inputmethod/m17n-im-config/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	m17n-im-config-0.9.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	inputmethod devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/
 
diff --git a/inputmethod/m17n-im-config/buildlink3.mk b/inputmethod/m17n-im-config/buildlink3.mk
index 665af9fb00a..2f10d008da6 100644
--- a/inputmethod/m17n-im-config/buildlink3.mk
+++ b/inputmethod/m17n-im-config/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:48 wiz Exp $
 
 BUILDLINK_TREE+=	m17n-im-config
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	m17n-im-config
 M17N_IM_CONFIG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.m17n-im-config+=	m17n-im-config>=0.9.0
-BUILDLINK_ABI_DEPENDS.m17n-im-config?=	m17n-im-config>=0.9.0nb2
+BUILDLINK_ABI_DEPENDS.m17n-im-config?=	m17n-im-config>=0.9.0nb3
 BUILDLINK_PKGSRCDIR.m17n-im-config?=	../../inputmethod/m17n-im-config
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile
index 4106674efa1..c6f98f50ff9 100644
--- a/inputmethod/nabi/Makefile
+++ b/inputmethod/nabi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		nabi-0.99.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		korean inputmethod
 MASTER_SITES=		http://kldp.net/frs/download.php/4929/
 
diff --git a/inputmethod/novel-pinyin/Makefile b/inputmethod/novel-pinyin/Makefile
index 4413819743b..ae54b4162c0 100644
--- a/inputmethod/novel-pinyin/Makefile
+++ b/inputmethod/novel-pinyin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/06/02 12:35:44 adam Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:49 wiz Exp $
 
 DISTNAME=	novel-pinyin-0.2.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=novel-pinyin/}
 
diff --git a/inputmethod/scim-anthy/Makefile b/inputmethod/scim-anthy/Makefile
index 58ca1476fac..9e5835805be 100644
--- a/inputmethod/scim-anthy/Makefile
+++ b/inputmethod/scim-anthy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/12/12 06:22:08 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-anthy-1.2.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/37309/}
 
diff --git a/inputmethod/scim-array/Makefile b/inputmethod/scim-array/Makefile
index ccd34f88f49..b88fdd30136 100644
--- a/inputmethod/scim-array/Makefile
+++ b/inputmethod/scim-array/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:48:43 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=	scim-array-1.0.1
+PKGREVISION=	1
 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 8a7b1ec54b4..9a201431d9f 100644
--- a/inputmethod/scim-bridge/Makefile
+++ b/inputmethod/scim-bridge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/11/26 12:30:12 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=	scim-bridge-0.4.16
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-canna/Makefile b/inputmethod/scim-canna/Makefile
index 458b70731e5..1bae6912d62 100644
--- a/inputmethod/scim-canna/Makefile
+++ b/inputmethod/scim-canna/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/15 11:32:47 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-canna-1.0.1
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29155/}
 
diff --git a/inputmethod/scim-ccinput/Makefile b/inputmethod/scim-ccinput/Makefile
index 0e88d53138b..0dcd1527547 100644
--- a/inputmethod/scim-ccinput/Makefile
+++ b/inputmethod/scim-ccinput/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/15 11:39:29 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-ccinput-0.3.1
+PKGREVISION=		1
 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 60c8fdceac0..dba2d334222 100644
--- a/inputmethod/scim-chewing/Makefile
+++ b/inputmethod/scim-chewing/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/15 11:37:22 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-chewing-0.3.3
+PKGREVISION=		1
 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 c625bce1212..f9798227aec 100644
--- a/inputmethod/scim-fcitx/Makefile
+++ b/inputmethod/scim-fcitx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:53:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-fcitx.3.1.1
 PKGNAME=		scim-fcitx-3.1.1
+PKGREVISION=		1
 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 c4aa60f68ac..a26e7ddad4d 100644
--- a/inputmethod/scim-hangul/Makefile
+++ b/inputmethod/scim-hangul/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:54:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-hangul-0.3.2
+PKGREVISION=		1
 CATEGORIES=		inputmethod korean
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-input-pad/Makefile b/inputmethod/scim-input-pad/Makefile
index f742d5eb64e..7439b4bc429 100644
--- a/inputmethod/scim-input-pad/Makefile
+++ b/inputmethod/scim-input-pad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:59:49 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=	scim-input-pad-0.1.2
+PKGREVISION=	1
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-m17n/Makefile b/inputmethod/scim-m17n/Makefile
index fa8087547ba..14c7d7d9b07 100644
--- a/inputmethod/scim-m17n/Makefile
+++ b/inputmethod/scim-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-m17n-0.2.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-pinyin/Makefile b/inputmethod/scim-pinyin/Makefile
index 41ef10ca46c..b74b00d3568 100644
--- a/inputmethod/scim-pinyin/Makefile
+++ b/inputmethod/scim-pinyin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:03:45 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-pinyin-0.5.91
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-prime/Makefile b/inputmethod/scim-prime/Makefile
index 929662b10e2..1bc62cac307 100644
--- a/inputmethod/scim-prime/Makefile
+++ b/inputmethod/scim-prime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:04:46 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-prime-1.0.1
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29156/}
 
diff --git a/inputmethod/scim-sinhala/Makefile b/inputmethod/scim-sinhala/Makefile
index 245f6480e88..71c2d33c0bb 100644
--- a/inputmethod/scim-sinhala/Makefile
+++ b/inputmethod/scim-sinhala/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:05:45 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-sinhala-0.1.0
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/16666/}
 
diff --git a/inputmethod/scim-skk/Makefile b/inputmethod/scim-skk/Makefile
index 3e15a31e500..cc5ecc84396 100644
--- a/inputmethod/scim-skk/Makefile
+++ b/inputmethod/scim-skk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:06:33 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-skk-0.5.2
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/18121/}
 
diff --git a/inputmethod/scim-tables/Makefile b/inputmethod/scim-tables/Makefile
index 5fbba7ff7a1..8fd784c96b2 100644
--- a/inputmethod/scim-tables/Makefile
+++ b/inputmethod/scim-tables/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:07:34 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-tables-0.5.9
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-thai/Makefile b/inputmethod/scim-thai/Makefile
index a58b2c517a5..0ac8d02972e 100644
--- a/inputmethod/scim-thai/Makefile
+++ b/inputmethod/scim-thai/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/11/30 09:20:45 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=	scim-thai-0.1.1
+PKGREVISION=	1
 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 1e2953417be..42f1012e643 100644
--- a/inputmethod/scim-tomoe/Makefile
+++ b/inputmethod/scim-tomoe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 09:31:35 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-tomoe-0.6.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tomoe/}
 
diff --git a/inputmethod/scim-uim/Makefile b/inputmethod/scim-uim/Makefile
index aab0f3b56a7..b8082772015 100644
--- a/inputmethod/scim-uim/Makefile
+++ b/inputmethod/scim-uim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:10:25 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=		scim-uim-0.2.0
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim-unikey/Makefile b/inputmethod/scim-unikey/Makefile
index d5ea145a3b7..7672bab3619 100644
--- a/inputmethod/scim-unikey/Makefile
+++ b/inputmethod/scim-unikey/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:11:39 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=	scim-unikey-0.3.1
+PKGREVISION=	1
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://scim-unikey.googlecode.com/files/
 
diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index 897b2be10ad..f2c0b5bb6a8 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
 #
 
 DISTNAME=		scim-1.4.9
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scim/}
 
diff --git a/inputmethod/scim/buildlink3.mk b/inputmethod/scim/buildlink3.mk
index e95942acdac..d486ca38e06 100644
--- a/inputmethod/scim/buildlink3.mk
+++ b/inputmethod/scim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:49 wiz Exp $
 
 BUILDLINK_TREE+=	scim
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	scim
 SCIM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.scim+=	scim>=1.4.7
+BUILDLINK_ABI_DEPENDS.scim?=	scim>=1.4.9nb1
 BUILDLINK_PKGSRCDIR.scim?=	../../inputmethod/scim
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/tomoe-gtk/Makefile b/inputmethod/tomoe-gtk/Makefile
index b91d0667a87..d207d925b00 100644
--- a/inputmethod/tomoe-gtk/Makefile
+++ b/inputmethod/tomoe-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/05/15 13:06:00 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=	tomoe-gtk-0.6.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}
 
diff --git a/inputmethod/tomoe-gtk/buildlink3.mk b/inputmethod/tomoe-gtk/buildlink3.mk
index acf52358d2f..70575d7d756 100644
--- a/inputmethod/tomoe-gtk/buildlink3.mk
+++ b/inputmethod/tomoe-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/05/14 11:02:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:50 wiz Exp $
 
 BUILDLINK_TREE+=	tomoe-gtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	tomoe-gtk
 TOMOE_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tomoe-gtk+=	tomoe-gtk>=0.6.0
-BUILDLINK_ABI_DEPENDS.tomoe-gtk+=	tomoe-gtk>=0.6.0nb3
+BUILDLINK_ABI_DEPENDS.tomoe-gtk+=	tomoe-gtk>=0.6.0nb4
 BUILDLINK_PKGSRCDIR.tomoe-gtk?=	../../inputmethod/tomoe-gtk
 
 .include "../../inputmethod/tomoe/buildlink3.mk"
diff --git a/inputmethod/uim-tomoe-gtk/Makefile b/inputmethod/uim-tomoe-gtk/Makefile
index 44514f9801b..bc0edb4e0a6 100644
--- a/inputmethod/uim-tomoe-gtk/Makefile
+++ b/inputmethod/uim-tomoe-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/05/15 12:55:01 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:50 wiz Exp $
 #
 
 DISTNAME=	uim-tomoe-gtk-0.6.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}