summaryrefslogtreecommitdiff
path: root/inputmethod/ibus-chewing
diff options
context:
space:
mode:
authorobache <obache>2013-09-20 12:19:02 +0000
committerobache <obache>2013-09-20 12:19:02 +0000
commit93e27e4c4643900545ebc167dff4871d6de61102 (patch)
tree60634487932f4efbc21df47800419933e2634399 /inputmethod/ibus-chewing
parent38777a5c00c787d9f913a2dc74ec513991654fec (diff)
downloadpkgsrc-93e27e4c4643900545ebc167dff4871d6de61102.tar.gz
fixes previous PKGLOCALEDIR support commit
* fixes missing PREFIX for PKGLOCALEDIR * avoid regeneration of *.po file from source update
Diffstat (limited to 'inputmethod/ibus-chewing')
-rw-r--r--inputmethod/ibus-chewing/Makefile18
-rw-r--r--inputmethod/ibus-chewing/distinfo4
-rw-r--r--inputmethod/ibus-chewing/patches/patch-src_main.c4
3 files changed, 8 insertions, 18 deletions
diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile
index a96d84ae77e..7dc73369f74 100644
--- a/inputmethod/ibus-chewing/Makefile
+++ b/inputmethod/ibus-chewing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/09/20 11:51:43 obache Exp $
+# $NetBSD: Makefile,v 1.29 2013/09/20 12:19:02 obache Exp $
#
DISTNAME= ibus-chewing-1.4.3-Source
@@ -17,14 +17,8 @@ BUILD_DEPENDS+= gob2-[0-9]*:../../devel/gob2
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgmerge pkg-config
-
-SUBST_CLASSES+= msgctxt
-SUBST_STAGE.msgctxt= post-patch
-SUBST_FILES.msgctxt= po/*.po po/*.pot
-SUBST_FILTER_CMD.msgctxt= ${STRIP_CMD.${MSGFMT_STRIP_MSGCTXT}}
-STRIP_CMD.yes= ${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk
-STRIP_CMD.no= ${CAT}
+USE_TOOLS+= msgfmt pkg-config
+TOOLS_NOOP+= msgmerge xgettext
GCONF_SCHEMAS= ibus-chewing.schemas
CMAKE_ARGS+= -DLIBEXEC_DIR=${PREFIX}/libexec
@@ -32,14 +26,10 @@ CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR}
SUBST_CLASSES+= localedir
SUBST_STAGE.localedir= pre-configure
-SUBST_VARS.localedir= PKGLOCALEDIR
+SUBST_VARS.localedir= PREFIX PKGLOCALEDIR
SUBST_FILES.localedir+= Modules/ManageTranslation.cmake
SUBST_FILES.localedir+= src/main.c
-# missing in archive
-post-extract:
- ${TOUCH} ${WRKSRC}/po/ibus-chewing.pot
-
.include "../../devel/GConf/schemas.mk"
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../inputmethod/libchewing/buildlink3.mk"
diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo
index b93937e17a2..98ac2b80574 100644
--- a/inputmethod/ibus-chewing/distinfo
+++ b/inputmethod/ibus-chewing/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2013/09/20 11:51:43 obache Exp $
+$NetBSD: distinfo,v 1.11 2013/09/20 12:19:02 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
+SHA1 (patch-src_main.c) = e273965ddc2880471b3dcdd0d468facd1b793582
diff --git a/inputmethod/ibus-chewing/patches/patch-src_main.c b/inputmethod/ibus-chewing/patches/patch-src_main.c
index 377e55deab6..ec3f1f849cb 100644
--- a/inputmethod/ibus-chewing/patches/patch-src_main.c
+++ b/inputmethod/ibus-chewing/patches/patch-src_main.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_main.c,v 1.1 2013/09/20 11:51:44 obache Exp $
+$NetBSD: patch-src_main.c,v 1.2 2013/09/20 12:19:02 obache Exp $
* PKGLOCALEDIR support
@@ -9,7 +9,7 @@ $NetBSD: patch-src_main.c,v 1.1 2013/09/20 11:51:44 obache Exp $
/* 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");
++ bindtextdomain(quote_me(PROJECT_NAME), "@PREFIX@/@PKGLOCALEDIR@/locale");
textdomain(quote_me(PROJECT_NAME));
context = g_option_context_new ("- ibus chewing engine component");