pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Rename msgfmt.mk to gettext.mk. The rest of ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1ef7dea14e4b
branches: trunk
changeset: 511373:1ef7dea14e4b
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Apr 13 18:45:01 2006 +0000
description:
Rename msgfmt.mk to gettext.mk. The rest of the gettext tool handling
will be moved here from replace.mk shortly.
diffstat:
mk/tools/bsd.tools.mk | 4 +-
mk/tools/gettext.mk | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
mk/tools/msgfmt.mk | 86 ------------------------------------------------
mk/tools/tools.Linux.mk | 5 ++-
mk/tools/tools.NetBSD.mk | 5 ++-
5 files changed, 96 insertions(+), 90 deletions(-)
diffs (231 lines):
diff -r f8e1ce8c3129 -r 1ef7dea14e4b mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk Thu Apr 13 18:38:55 2006 +0000
+++ b/mk/tools/bsd.tools.mk Thu Apr 13 18:45:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.33 2006/04/13 16:35:58 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.34 2006/04/13 18:45:01 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -111,7 +111,7 @@
.include "../../mk/tools/automake.mk"
.include "../../mk/tools/autoconf.mk"
.include "../../mk/tools/texinfo.mk"
-.include "../../mk/tools/msgfmt.mk"
+.include "../../mk/tools/gettext.mk"
.include "../../mk/tools/ldconfig.mk"
.include "../../mk/tools/rpcgen.mk"
.include "../../mk/tools/strip.mk"
diff -r f8e1ce8c3129 -r 1ef7dea14e4b mk/tools/gettext.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/tools/gettext.mk Thu Apr 13 18:45:01 2006 +0000
@@ -0,0 +1,86 @@
+# $NetBSD: gettext.mk,v 1.1 2006/04/13 18:45:01 jlam Exp $
+#
+# Copyright (c) 2006 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the NetBSD
+# Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+.if !defined(TOOLS_IGNORE.msgfmt) && !empty(USE_TOOLS:C/:.*//:Mmsgfmt)
+. if !empty(PKGPATH:Mdevel/gettext-tools)
+MAKEFLAGS+= TOOLS_IGNORE.msgfmt=
+. else
+. if defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)
+. if !defined(_TOOLS_USE_PKGSRC.msgfmt)
+#
+# Discover if the version on the builtin msgfmt is new enough to handle
+# msgid_plural (at least 0.10.35).
+#
+_TOOLS_VERSION.msgfmt!= ${TOOLS_PLATFORM.msgfmt} --version | \
+ ${AWK} '{ print $$4; exit }'
+_TOOLS_USE_PKGSRC.msgfmt!= \
+ if ${PKG_ADMIN} pmatch "gettext>=0.10.35" \
+ gettext-${_TOOLS_VERSION.msgfmt:Q}; then \
+ ${ECHO} no; \
+ else \
+ ${ECHO} yes; \
+ fi
+. endif
+MAKEVARS+= _TOOLS_USE_PKGSRC.msgfmt
+. else
+_TOOLS_USE_PKGSRC.msgfmt= yes
+. endif
+
+# 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?= {gettext>=0.10.36,gettext-tools>=0.14.5}:../../devel/gettext-tools
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.msgfmt=${TOOLS_DEPENDS.msgfmt:C/:.*//}
+TOOLS_PATH.msgfmt= ${TOOLS_PREFIX.msgfmt}/bin/msgfmt
+. else
+USE_TOOLS+= awk sh
+TOOLS_PATH.msgfmt= ${PKGSRCDIR}/mk/tools/msgfmt.sh
+TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q} \
+ MSGFMT=${TOOLS_PLATFORM.msgfmt:Q} \
+ ${TOOLS_SH} ${TOOLS_PATH.msgfmt} "$$@"
+. endif
+. endif
+.endif
diff -r f8e1ce8c3129 -r 1ef7dea14e4b mk/tools/msgfmt.mk
--- a/mk/tools/msgfmt.mk Thu Apr 13 18:38:55 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-# $NetBSD: msgfmt.mk,v 1.1 2006/04/13 16:35:58 jlam Exp $
-#
-# Copyright (c) 2006 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Johnny C. Lam.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the NetBSD
-# Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-.if !defined(TOOLS_IGNORE.msgfmt) && !empty(USE_TOOLS:C/:.*//:Mmsgfmt)
-. if !empty(PKGPATH:Mdevel/gettext-tools)
-MAKEFLAGS+= TOOLS_IGNORE.msgfmt=
-. else
-. if defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)
-. if !defined(_TOOLS_USE_PKGSRC.msgfmt)
-#
-# Discover if the version on the builtin msgfmt is new enough to handle
-# msgid_plural (at least 0.10.35).
-#
-_TOOLS_VERSION.msgfmt!= ${TOOLS_PLATFORM.msgfmt} --version | \
- ${AWK} '{ print $$4; exit }'
-_TOOLS_USE_PKGSRC.msgfmt!= \
- if ${PKG_ADMIN} pmatch "gettext>=0.10.35" \
- gettext-${_TOOLS_VERSION.msgfmt:Q}; then \
- ${ECHO} no; \
- else \
- ${ECHO} yes; \
- fi
-. endif
-MAKEVARS+= _TOOLS_USE_PKGSRC.msgfmt
-. else
-_TOOLS_USE_PKGSRC.msgfmt= yes
-. endif
-
-# 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?= {gettext>=0.10.36,gettext-tools>=0.14.5}:../../devel/gettext-tools
-TOOLS_FIND_PREFIX+= TOOLS_PREFIX.msgfmt=${TOOLS_DEPENDS.msgfmt:C/:.*//}
-TOOLS_PATH.msgfmt= ${TOOLS_PREFIX.msgfmt}/bin/msgfmt
-. else
-USE_TOOLS+= awk sh
-TOOLS_PATH.msgfmt= ${PKGSRCDIR}/mk/tools/msgfmt.sh
-TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q} \
- MSGFMT=${TOOLS_PLATFORM.msgfmt:Q} \
- ${TOOLS_SH} ${TOOLS_PATH.msgfmt} "$$@"
-. endif
-. endif
-.endif
diff -r f8e1ce8c3129 -r 1ef7dea14e4b mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk Thu Apr 13 18:38:55 2006 +0000
+++ b/mk/tools/tools.Linux.mk Thu Apr 13 18:45:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.31 2006/04/13 16:35:59 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.32 2006/04/13 18:45:01 jlam Exp $
#
# System-supplied tools for the Linux operating system.
@@ -171,3 +171,6 @@
TOOLS_PLATFORM.tsort?= /usr/bin/tsort
TOOLS_PLATFORM.wc?= /usr/bin/wc
TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r
+.if exists(/usr/bin/xgettext)
+TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
+.endif
diff -r f8e1ce8c3129 -r 1ef7dea14e4b mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk Thu Apr 13 18:38:55 2006 +0000
+++ b/mk/tools/tools.NetBSD.mk Thu Apr 13 18:45:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.27 2006/04/13 16:35:59 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.28 2006/04/13 18:45:01 jlam Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -94,4 +94,7 @@
TOOLS_PLATFORM.tsort?= /usr/bin/tsort
TOOLS_PLATFORM.wc?= /usr/bin/wc
TOOLS_PLATFORM.xargs?= /usr/bin/xargs
+.if exists(/usr/bin/xgettext)
+TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
+.endif
TOOLS_PLATFORM.yacc?= /usr/bin/yacc
Home |
Main Index |
Thread Index |
Old Index