diff options
| author | obache <obache> | 2013-05-02 13:12:03 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-05-02 13:12:03 +0000 |
| commit | 14dbec5c5ce0f1e72e06f17ce832a24f2c5daf3e (patch) | |
| tree | 1bc958e79aeb060fe49f0983d1a34fc3e8cb58f1 | |
| parent | e6807242083abee3936fdb0fca5753c494a9e0bf (diff) | |
| download | pkgsrc-14dbec5c5ce0f1e72e06f17ce832a24f2c5daf3e.tar.gz | |
* bump required gettext-tools from pkgsrc to 0.15 to match required gettext-lib capability.
* prevent to restrict gettext-tools capability from builtin gettext-tools' one
even if using it from pkgsrc.
| -rw-r--r-- | mk/tools/gettext.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/mk/tools/gettext.mk b/mk/tools/gettext.mk index b6cc76a4359..b79ad5b97a8 100644 --- a/mk/tools/gettext.mk +++ b/mk/tools/gettext.mk @@ -1,4 +1,4 @@ -# $NetBSD: gettext.mk,v 1.16 2012/09/03 14:59:33 adam Exp $ +# $NetBSD: gettext.mk,v 1.17 2013/05/02 13:12:03 obache Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,7 +40,7 @@ # treated specially below. # _TOOLS.gettext-tools= gettext msgmerge xgettext msgconv autopoint -_TOOLS_DEP.gettext-tools= {gettext-tools>=0.14.5,gettext>=0.10.36<0.14.5} +_TOOLS_DEP.gettext-tools= gettext-tools>=0.15 .for _t_ in ${_TOOLS.gettext-tools} . if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_}) @@ -56,8 +56,19 @@ USE_TOOLS+= msgfmt . if !empty(PKGPATH:Mdevel/gettext-tools) MAKEFLAGS+= TOOLS_IGNORE.msgfmt= . else -. if defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt) +# If we're not using the builtin gettext implementation, then we should +# definitely be using the pkgsrc version of msgfmt (gettext-tools). +# +CHECK_BUILTIN.gettext:= yes +. include "../../devel/gettext-lib/builtin.mk" +CHECK_BUILTIN.gettext:= no +. if !empty(USE_BUILTIN.gettext:M[nN][oO]) +_TOOLS_USE_PKGSRC.msgfmt= yes +. endif + _TOOLS_USE_PKGSRC.msgfmt?= no +. if empty(_TOOLS_USE_PKGSRC.msgfmt:M[Yy][Ee][Ss]) && \ + defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt) # # MSGFMT_STRIP_MSGID_PLURAL: Yes for msgfmt < 0.10.36 # MSGFMT_STRIP_MSGCTXT: Yes for msgfmt < 0.15 @@ -102,16 +113,6 @@ _TOOLS_USE_MSGFMT_SH= no . endif MAKEVARS+= _TOOLS_USE_MSGFMT_SH -# If we're not using the builtin gettext implementation, then we should -# definitely be using the pkgsrc version of msgfmt (gettext-tools). -# -CHECK_BUILTIN.gettext:= yes -. include "../../devel/gettext-lib/builtin.mk" -CHECK_BUILTIN.gettext:= no -. if !empty(USE_BUILTIN.gettext:M[nN][oO]) -_TOOLS_USE_PKGSRC.msgfmt= yes -. endif - . if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS]) TOOLS_CREATE+= msgfmt TOOLS_DEPENDS.msgfmt?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools |