Add workaround for upstream Issue#1029:

http://code.google.com/p/ibus/issues/detail?id=1029

6 files changed, 27 insertions, 5 deletions

diff --git a/inputmethod/ibus-anthy/Makefile b/inputmethod/ibus-anthy/Makefile
index dd8812e9fd0..b5346bbd6fa 100644
--- a/inputmethod/ibus-anthy/Makefile
+++ b/inputmethod/ibus-anthy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 01:50:52 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/11 13:11:57 obache Exp $
 #
 
 DISTNAME=	ibus-anthy-1.2.1
@@ -33,6 +33,8 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	engine/ibus-engine-anthy.in setup/ibus-setup-anthy.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
+.include "../../inputmethod/ibus/bad-env-usage.mk"
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 PY_PATCHPLIST=		yes
diff --git a/inputmethod/ibus-hangul/Makefile b/inputmethod/ibus-hangul/Makefile
index 626a2411338..bb8fbee421f 100644
--- a/inputmethod/ibus-hangul/Makefile
+++ b/inputmethod/ibus-hangul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 01:58:15 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/11 13:11:57 obache Exp $
 #
 
 DISTNAME=	ibus-hangul-1.3.0.20100329
@@ -22,6 +22,8 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	setup/ibus-setup-hangul.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
+.include "../../inputmethod/ibus/bad-env-usage.mk"
+
 BUILDLINK_API_DEPENDS.libhangul+=	libhangul>=0.0.10
 .include "../../inputmethod/libhangul/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
diff --git a/inputmethod/ibus-m17n/Makefile b/inputmethod/ibus-m17n/Makefile
index 95e8422fd55..b6865f40463 100644
--- a/inputmethod/ibus-m17n/Makefile
+++ b/inputmethod/ibus-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 02:00:08 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/11 13:11:57 obache Exp $
 #
 
 DISTNAME=	ibus-m17n-1.3.0
@@ -18,6 +18,8 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config msgfmt gmake
 
+.include "../../inputmethod/ibus/bad-env-usage.mk"
+
 .include "../../devel/m17n-lib/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-pinyin/Makefile b/inputmethod/ibus-pinyin/Makefile
index d48dcb0170b..667b988104b 100644
--- a/inputmethod/ibus-pinyin/Makefile
+++ b/inputmethod/ibus-pinyin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 02:02:40 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/11 13:11:57 obache Exp $
 #
 
 DISTNAME=	ibus-pinyin-1.3.10
@@ -39,6 +39,8 @@ CONFIGURE_ARGS+=	--enable-db-open-phrase
 
 .include "options.mk"
 
+.include "../../inputmethod/ibus/bad-env-usage.mk"
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index bcbb2930e99..2d0a111b216 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 01:48:31 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/11 13:11:56 obache Exp $
 #
 
 DISTNAME=	ibus-1.3.7
@@ -41,6 +41,8 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
+.include "bad-env-usage.mk"
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/inputmethod/ibus/bad-env-usage.mk b/inputmethod/ibus/bad-env-usage.mk
new file mode 100644
index 00000000000..99e0684ee53
--- /dev/null
+++ b/inputmethod/ibus/bad-env-usage.mk
@@ -0,0 +1,12 @@
+# $NetBSD: bad-env-usage.mk,v 1.1 2010/08/11 13:11:56 obache Exp $
+#
+
+# Makefile intended to be included by packages that need to fix bad env usage:
+#   http://code.google.com/p/ibus/issues/detail?id=1029
+
+SUBST_CLASSES+=		badenv
+SUBST_MESSAGE.badenv=	Fixing bad ENV usage.
+SUBST_STAGE.badenv=	do-configure-pre-hook
+SUBST_FILES.badenv=	${_REPLACE_LOCALEDIR}
+SUBST_SED.badenv=	-e 's|^ENV[ 	:]*=|BIN_ENV=|'	
+SUBST_SED.badenv+=	-e 's|\$$(ENV)|$$\(BIN_ENV\)|g'