Sun Nov 9 02:26:27 2014 UTC ()
Requirement of gettext tools from pkgsrc depend on existence of the tool itself,
not msgfmt tool.


(obache)
diff -r1.17 -r1.18 pkgsrc/mk/tools/gettext.mk
cvs diff -r1.17 -r1.18 pkgsrc/mk/tools/gettext.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/gettext.mk 2013/05/02 13:12:03 1.17
+++ pkgsrc/mk/tools/gettext.mk 2014/11/09 02:26:27 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gettext.mk,v 1.17 2013/05/02 13:12:03 obache Exp $ 1# $NetBSD: gettext.mk,v 1.18 2014/11/09 02:26:27 obache Exp $
2# 2#
3# Copyright (c) 2006 The NetBSD Foundation, Inc. 3# Copyright (c) 2006 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -126,27 +126,27 @@ TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q}  @@ -126,27 +126,27 @@ TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q}
126 MSGFMT=${TOOLS_PATH.msgfmt:Q} \ 126 MSGFMT=${TOOLS_PATH.msgfmt:Q} \
127 PKGSRCDIR=${PKGSRCDIR:Q} \ 127 PKGSRCDIR=${PKGSRCDIR:Q} \
128 MSGFMT_STRIP_MSGID_PLURAL=${MSGFMT_STRIP_MSGID_PLURAL} \ 128 MSGFMT_STRIP_MSGID_PLURAL=${MSGFMT_STRIP_MSGID_PLURAL} \
129 MSGFMT_STRIP_MSGCTXT=${MSGFMT_STRIP_MSGCTXT} \ 129 MSGFMT_STRIP_MSGCTXT=${MSGFMT_STRIP_MSGCTXT} \
130 ${TOOLS_SH} ${PKGSRCDIR}/mk/tools/msgfmt.sh "$$@" 130 ${TOOLS_SH} ${PKGSRCDIR}/mk/tools/msgfmt.sh "$$@"
131. endif 131. endif
132. endif 132. endif
133.endif 133.endif
134 134
135.for _t_ in ${_TOOLS.gettext-tools} 135.for _t_ in ${_TOOLS.gettext-tools}
136. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_}) 136. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_})
137. if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS]) 137. if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS])
138_TOOLS_USE_PKGSRC.${_t_}= yes 138_TOOLS_USE_PKGSRC.${_t_}= yes
139. elif defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt) 139. elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
140_TOOLS_USE_PKGSRC.${_t_}?= no 140_TOOLS_USE_PKGSRC.${_t_}?= no
141. else 141. else
142_TOOLS_USE_PKGSRC.${_t_}?= yes 142_TOOLS_USE_PKGSRC.${_t_}?= yes
143. endif 143. endif
144. if !empty(PKGPATH:Mdevel/gettext-tools) 144. if !empty(PKGPATH:Mdevel/gettext-tools)
145MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 145MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
146. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 146. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
147TOOLS_DEPENDS.${_t_}?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools 147TOOLS_DEPENDS.${_t_}?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
148TOOLS_CREATE+= ${_t_} 148TOOLS_CREATE+= ${_t_}
149TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.${_t_}:C/:.*//} 149TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.${_t_}:C/:.*//}
150TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} 150TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
151. endif 151. endif
152. endif 152. endif