fixes for the case of PKGLOCALEDIR != share.

4 files changed, 40 insertions, 2 deletions

diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile
index 5516dbcc786..a96d84ae77e 100644
--- a/inputmethod/ibus-chewing/Makefile
+++ b/inputmethod/ibus-chewing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/09/02 19:51:11 adam Exp $
+# $NetBSD: Makefile,v 1.28 2013/09/20 11:51:43 obache Exp $
 #
 
 DISTNAME=	ibus-chewing-1.4.3-Source
@@ -30,6 +30,12 @@ GCONF_SCHEMAS=	ibus-chewing.schemas
 CMAKE_ARGS+=	-DLIBEXEC_DIR=${PREFIX}/libexec
 CMAKE_ARGS+=	-DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR}
 
+SUBST_CLASSES+=		localedir
+SUBST_STAGE.localedir=	pre-configure
+SUBST_VARS.localedir=	PKGLOCALEDIR
+SUBST_FILES.localedir+=	Modules/ManageTranslation.cmake
+SUBST_FILES.localedir+=	src/main.c
+
 # missing in archive
 post-extract:
 	${TOUCH} ${WRKSRC}/po/ibus-chewing.pot
diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo
index 42023dd979e..b93937e17a2 100644
--- a/inputmethod/ibus-chewing/distinfo
+++ b/inputmethod/ibus-chewing/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/12/22 08:41:36 obache Exp $
+$NetBSD: distinfo,v 1.10 2013/09/20 11:51:43 obache Exp $
 
 SHA1 (ibus-chewing-1.4.3-Source.tar.gz) = 82ec86daf2b7f3de88410ec01c9f41db0184f91e
 RMD160 (ibus-chewing-1.4.3-Source.tar.gz) = b08e2f0a34c0168a3b69c6273ac614f81fdb2d0f
 Size (ibus-chewing-1.4.3-Source.tar.gz) = 84023 bytes
 SHA1 (patch-Modules_DateTimeFormat.cmake) = 588068914de5db765c1c5d1a623e3b73f720a64f
+SHA1 (patch-Modules_ManageTranslation.cmake) = b4b4873e040b64c209e93f0574f4544c440ee575
+SHA1 (patch-src_main.c) = e44f0524fc6779f0d12315650ef4e71582d66a97
diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake
new file mode 100644
index 00000000000..d047244b94a
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.1 2013/09/20 11:51:44 obache Exp $
+
+* PKGLOCALEDIR support
+
+--- Modules/ManageTranslation.cmake.orig	2012-11-26 07:37:40.000000000 +0000
++++ Modules/ManageTranslation.cmake
+@@ -198,7 +198,7 @@ IF(NOT DEFINED _MANAGE_TRANSLATION_CMAKE
+ 		    )
+ 
+ 		#MESSAGE("_absPoFile=${_absPoFile} _absPotDir=${_absPotDir} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
+-		INSTALL(FILES ${_absGmoFile} DESTINATION share/locale/${_locale}/LC_MESSAGES RENAME ${_potBasename}.mo)
++		INSTALL(FILES ${_absGmoFile} DESTINATION @PKGLOCALEDIR@/locale/${_locale}/LC_MESSAGES RENAME ${_potBasename}.mo)
+ 		LIST(APPEND _absGmoFileList ${_absGmoFile})
+ 		LIST(APPEND _absPoFileList ${_absPoFile})
+ 	    ENDFOREACH(_locale ${_localeList})
diff --git a/inputmethod/ibus-chewing/patches/patch-src_main.c b/inputmethod/ibus-chewing/patches/patch-src_main.c
new file mode 100644
index 00000000000..377e55deab6
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-src_main.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_main.c,v 1.1 2013/09/20 11:51:44 obache Exp $
+
+* PKGLOCALEDIR support
+
+--- src/main.c.orig	2012-10-22 05:32:11.000000000 +0000
++++ src/main.c
+@@ -146,7 +146,7 @@ main (gint argc, gchar *argv[])
+ 
+     /* Init i18n messages */
+     setlocale (LC_ALL, "zh_TW.utf8");
+-    bindtextdomain(quote_me(PROJECT_NAME), quote_me(DATA_DIR) "/locale");
++    bindtextdomain(quote_me(PROJECT_NAME), "@PKGLOCALEDIR@/locale");
+     textdomain(quote_me(PROJECT_NAME));
+ 
+     context = g_option_context_new ("- ibus chewing engine component");