The NetBSD Project

CVS log for pkgsrc/mk/tools/gettext.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk / tools

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.24: download - view: text, markup, annotated - select for diffs
Tue Jun 27 10:27:21 2023 UTC (3 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, pkgsrc-2026Q1-base, pkgsrc-2026Q1, pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2, pkgsrc-2025Q1-base, pkgsrc-2025Q1, pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, HEAD
Diff to: previous 1.23: preferred, colored
Changes since revision 1.23: +3 -3 lines
Split native and cross LOCALBASE for cross-compilation.

This way, you can use an unprivileged prefix of ~/cross/pkg to
cross-compile packages that, when installed, will go in /usr/pkg.

In mk.conf:

- Set CROSS_LOCALBASE to determine the installation prefix of
  packages that you cross-compile.

- Set LOCALBASE to determine the installation prefix of native
  packages needed for cross compilation.

Both default to /usr/pkg.  Note: CROSS_LOCALBASE defaults to /usr/pkg
even if you set LOCALBASE.  Of course, if you're not cross-compiling,
this has no effect.

When cross-compiling a package:

- LOCALBASE is where cross-compiled packages will be installed.

  (`make install' will put it in ${CROSS_DESTDIR}${LOCALBASE}, of
  course, but when you later use pkg_add to install the binary
  package on the system you're compiling it for, it will go in
  ${LOCALBASE}.  And you can still set PREFIX for an individual
  package, but LOCALBASE refers to where cross-compiled packages are
  generally installed, other than the specific ones that override
  PREFIX.)

- TOOLBASE is where tool dependencies are installed and available to
  be executed at build-time.

  For example, if you have TOOL_DEPENDS on a program that is
  installed in (say) foo/bin/xyz which is not in PATH so you have to
  refer ot its full pathname, you can execute ${TOOLBASE}/foo/bin/xyz
  instead of ${LOCALBASE}/foo/bin/xyz.

I chose this split, rather than the other way around, because I
expect that references that are baked into installed packages to be
more common than references that are executed at build-time, but I
didn't do an extensive study of the matter.  I chose the name
TOOLBASE because it's where TOOL_DEPENDS go.

Revision 1.23: download - view: text, markup, annotated - select for diffs
Sat Mar 4 23:29:24 2023 UTC (3 years, 8 months ago) by rillig
Branches: MAIN
CVS tags: pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1
Diff to: previous 1.22: preferred, colored
Changes since revision 1.22: +4 -4 lines
mk/tools: replace '!empty' conditions with '==' or '!='

Main work done by running 'pkglint -F --only "simpler" --only
"simplified" *.mk', with manual improvements afterwards:

* Removed several redundant ':U' modifiers, as pkglint doesn't know the
  exact order in which the infrastructure files include each other.

* Removed redundant 'defined(X11_TYPE)' and the corresponding comment.

Revision 1.22: download - view: text, markup, annotated - select for diffs
Wed Aug 22 20:48:37 2018 UTC (8 years, 2 months ago) by maya
Branches: MAIN
CVS tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3
Diff to: previous 1.21: preferred, colored
Changes since revision 1.21: +1 -8 lines
Remove clauses 3,4 from TNF-only copyright blocks.

This is based on the decision The NetBSD Foundation made in 2008 to
do so, which was already applied to src.

This change has been applied to code which is likely not in other
repositories.

ok board@, reviewed by riastradh@

Revision 1.21: download - view: text, markup, annotated - select for diffs
Wed Nov 25 13:05:47 2015 UTC (10 years, 11 months ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4
Diff to: previous 1.20: preferred, colored
Changes since revision 1.20: +3 -5 lines
Remove mk/find-prefix.mk and its usage from the mk infrastructure.

The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.

Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure.  Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.

Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.

Revision 1.20: download - view: text, markup, annotated - select for diffs
Mon Feb 16 10:40:40 2015 UTC (11 years, 9 months ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1
Diff to: previous 1.19: preferred, colored
Changes since revision 1.19: +1 -1 lines
Put back the fix which checks the variables associated to each gettext tool
instead of checking those of msgfmt.

Revision 1.19: download - view: text, markup, annotated - select for diffs
Sun Feb 1 11:46:10 2015 UTC (11 years, 9 months ago) by obache
Branches: MAIN
Diff to: previous 1.18: preferred, colored
Changes since revision 1.18: +2 -2 lines
Revert
 Requirement of gettext tools from pkgsrc depend on existence of the tool itself,
 not msgfmt tool.
proposed/discussed is required for such changes.

Revision 1.18: download - view: text, markup, annotated - select for diffs
Sun Nov 9 02:26:27 2014 UTC (12 years ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2014Q4-base, pkgsrc-2014Q4
Diff to: previous 1.17: preferred, colored
Changes since revision 1.17: +2 -2 lines
Requirement of gettext tools from pkgsrc depend on existence of the tool itself,
not msgfmt tool.

Revision 1.17: download - view: text, markup, annotated - select for diffs
Thu May 2 13:12:03 2013 UTC (13 years, 6 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +14 -13 lines
* 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.

Revision 1.16: download - view: text, markup, annotated - select for diffs
Mon Sep 3 14:59:33 2012 UTC (14 years, 2 months ago) by adam
Branches: MAIN
CVS tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +7 -7 lines
Now MSGFMT_STRIP_MSGCTXT defaults to 'no', since devel/getttext-tools is the latest and can handle msgctxt tags

Revision 1.15: download - view: text, markup, annotated - select for diffs
Tue Aug 16 12:14:27 2011 UTC (15 years, 3 months ago) by abs
Branches: MAIN
CVS tags: pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +2 -2 lines
Add autopoint to _TOOLS.gettext-tools

Revision 1.14: download - view: text, markup, annotated - select for diffs
Sat Apr 10 00:46:23 2010 UTC (16 years, 7 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +2 -3 lines
strip \r in awk script, avoid to extra `tr' exec.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Fri Apr 9 15:44:17 2010 UTC (16 years, 7 months ago) by wiz
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +3 -2 lines
Use patch from obache that strips out DOS line endings.
Needed at least for graphics/gimp.

Revision 1.12: download - view: text, markup, annotated - select for diffs
Sun Mar 22 18:10:27 2009 UTC (17 years, 7 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +1 -2 lines
Fix copy&paste error resulting in duplicate .endif.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Sun Mar 22 17:57:58 2009 UTC (17 years, 7 months ago) by joerg
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +25 -15 lines
Rename MSGFMT_STRIP_MSGCTX to MSGFMT_STRIP_MSGCTXT to reflect what is
stripped. Allow the script to be used for pkgsrc msgfmt as well. Set
MSGFMT_STRIP_MSGCTXT automatically for msgfmt before 0.15.

Revision 1.10: download - view: text, markup, annotated - select for diffs
Fri Mar 20 20:17:30 2009 UTC (17 years, 8 months ago) by joerg
Branches: MAIN
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +4 -4 lines
MSGFMT_STRIP_* applies to both the native and the pkgsrc version, so
move the conditional block into the shared path.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Fri Mar 20 16:13:02 2009 UTC (17 years, 8 months ago) by joerg
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +23 -8 lines
Refactor msgfmt.sh script to conditionally strip the msgid_plural for
old NetBSD versions and to strip msgctx if requested by the package.
This allows to replace the use of msgfmtstrip in various packages by
setting MSGFMT_STRIP_MSGCTX.

Revision 1.8: download - view: text, markup, annotated - select for diffs
Fri Jun 15 17:11:33 2007 UTC (19 years, 5 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, cwrapper, cube-native-xorg-base, cube-native-xorg
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +2 -2 lines
Add msgconv to the gettext tools.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Wed Jun 13 14:21:47 2007 UTC (19 years, 5 months ago) by joerg
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +2 -2 lines
gettext-tools was split off with version 0.14.5 of gettext,
so use either a newer version of the former or an older version
of the latter.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Fri Sep 15 14:18:41 2006 UTC (20 years, 2 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, jlam-pkgviews-base, jlam-pkgviews
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +2 -2 lines
Now, gettext tools is available from devel/gettext-tools, so prioritize
gettext-tools over gettext.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Wed Jul 5 04:32:10 2006 UTC (20 years, 4 months ago) by jlam
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +2 -2 lines
Teach the tools framework about the following new tools:

	itools, intltool, diff3, sdiff, msgmerge

* Adding USE_TOOLS+=itools to a package Makefile will cause the
  tool-directory versions of imake, makedepend, mkdirhier and xmkmf
  to point to the ones from the devel/nbitools package.

  This change will remove the need for nbitools/buildlink3.mk, which
  currently does a bit of hackery to force the "right" imake tools to
  be used by packages that need it.

* Adding USE_TOOLS+=intltool to a package Makefile will cause the
  local versions of intltool-* inside ${WRKSRC} to be replaced by
  copies from the textproc/intltool package.  If "intltool" is not
  specified as a tool, then we create "broken" intltool-* tools in
  the tools directory to help highlight hidden dependencies on the
  intltool package.

  In addition, modify the tools framework so that if "perl" is not
  specified as a tool, then we create a "broken" perl tool in the
  tools directory for the same reason as for "intltool".

  These two changes together will remove the need for
  intltools/buildlink3.mk and should also catch all cases where the
  sources' intltools may have been silently used because perl was
  found on the system.

* Adding USE_TOOLS+=diff3, USE_TOOLS+=sdiff, or USE_TOOLS+=msgmerge
  to a package Makefile will cause the corresponding tool to be pulled
  into the tools directory.

  These are convenience tools to help simplify dependencies for some
  packages.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Sat Apr 15 16:48:12 2006 UTC (20 years, 7 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +13 -8 lines
There are two things that we need to keep track of:

   (1) whether or not the built-in msgfmt supports msgid_plural, and
       thus whether we need to use the msgfmt.sh script
       (_TOOLS_USE_MSGFMT_SH), and

   (2) whether or not we need to use the pkgsrc version of msgfmt
       (_TOOLS_USE_PKGSRC.msgfmt)

If we truly don't need to use msgfmt.sh, then never invoke it.  This is
the case on NetBSD>=3.x.  This should fix the problem with building the
*.po files in fonts/fontforge on NetBSD-current.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Fri Apr 14 13:49:17 2006 UTC (20 years, 7 months ago) by jlam
Branches: MAIN
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +2 -2 lines
Use the correct cat command.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Thu Apr 13 19:24:29 2006 UTC (20 years, 7 months ago) by jlam
Branches: MAIN
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +39 -2 lines
Move the gettext tools handling to mk/tools/gettext.mk.  We ensure
that we use the pkgsrc versions of xgettext and gettext if we're also
using the pkgsrc version of msgfmt.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Thu Apr 13 18:45:01 2006 UTC (20 years, 7 months ago) by jlam
Branches: MAIN
Rename msgfmt.mk to gettext.mk.  The rest of the gettext tool handling
will be moved here from replace.mk shortly.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>