Update to 0.20.1 Changelog: Version 0.20.1 - May 2019 * Important bug fix: - Fixed a wrong shared library versioning of libintl.so. Version 0.20 - May 2019 * Support for reproducible builds: - msgfmt now eliminates the POT-Creation-Date header field from .mo files. * Improvements for translators: - update-po target in Makefile.in.in now uses msgmerge --previous. * Improvements for maintainers: - msgmerge now has an option --for-msgfmt, that produces a PO file meant for use by msgfmt only. This option saves processing time, in particular by omitting fuzzy matching that is not useful in this situation. - The .pot file in a 'po' directory is now erased by "make maintainer-clean". - It is now possible to override xgettext options from the po/Makefile.in.in through options in XGETTEXT_OPTIONS (declared in po/Makevars). - The --intl option of the gettextize program (deprecated since 2010) is no longer available. Instead of including the intl sources in your package, we suggest making the libintl library an optional prerequisite of your package. This will simplify the build system of your package. - Accordingly, the Autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is gone as well. * Programming languages support: - C, C++: xgettext now supports strings in u8"..." syntax, as specified in C11 and C++11. - C, C++: xgettext now supports 'p'/'P' exponent markers in number tokens, as specified in C99 and C++17. - C++: xgettext now supports underscores in number tokens. - C++: xgettext now supports single-quotes in number tokens, as specified in C++14. - Shell: o The programs 'gettext', 'ngettext' now support a --context argument. o gettext.sh contains new function eval_pgettext and eval_npgettext for producing translations of messages with context. - Java: o xgettext now supports UTF-8 encoded .properties files (a new feature of Java 9). o The build system and tools now support Java 9, 10, and 11. On the other hand, support for old versions of Java (Java 5 and older, GCJ 4.2.x and older) has been dropped. - Perl: o Native support for context functions (pgettext, dpgettext, dcpgettext, npgettext, dnpgettext, dcnpgettext). o better detection of question mark and slash as operators (as opposed to regular expression delimiters). - Scheme: xgettext now parses the syntax for specialized byte vectors (#u8(...), #vu8(...), etc.) correctly. - Pascal: xgettext can now extract strings from .rsj files, produced by the Free Pascal compiler version 3.0.0 or newer. - Vala: xgettext now parses escape sequences in strings more accurately. - JavaScript: xgettext now parses template literals correctly. * Runtime behaviour: - The interpretation of the language preferences on macOS has been fixed. - Per-thread locales are now also supported on Solaris 11.4. - The replacements for the printf()/fprintf()/... functions that are provided through <libintl.h> on native Windows and NetBSD are now POSIX compliant. There is no conflict any more between these replacements and other possible replacements provided by gnulib or mingw. * Libtextstyle: - This package installs a new library 'libtextstyle', together with a new header file <textstyle.h>. It is a library for styling text output sent to a console or terminal emulator. Packagers: please see the suggested packaging hints in the file PACKAGING.diff -r1.84 -r1.85 pkgsrc/devel/gettext/Makefile
(ryoon)
@@ -1,45 +1,43 @@ | @@ -1,45 +1,43 @@ | |||
1 | # $NetBSD: Makefile,v 1.84 2017/06/26 21:22:49 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.85 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | .include "../../devel/gettext/Makefile.common" | 3 | .include "../../devel/gettext/Makefile.common" | |
4 | 4 | |||
5 | COMMENT= Tools for providing messages in different languages | 5 | COMMENT= Tools for providing messages in different languages | |
6 | 6 | |||
7 | DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4 | 7 | DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4 | |
8 | DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools | 8 | DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools | |
9 | BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18 | 9 | BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18 | |
10 | 10 | |||
11 | USE_LANGUAGES= c c++ | 11 | USE_LANGUAGES= c c++ | |
12 | USE_PKGLOCALEDIR= yes | 12 | USE_PKGLOCALEDIR= yes | |
13 | SHLIBTOOL_OVERRIDE= # empty | 13 | SHLIBTOOL_OVERRIDE= # empty | |
14 | CONFIGURE_ARGS+= --disable-csharp | 14 | CONFIGURE_ARGS+= --disable-csharp | |
15 | CONFIGURE_ARGS+= --without-git | 15 | CONFIGURE_ARGS+= --without-git | |
16 | CONFIGURE_ARGS+= --without-included-gettext | 16 | CONFIGURE_ARGS+= --without-included-gettext | |
17 | CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= | 17 | CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= | |
18 | CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= | 18 | CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= | |
19 | CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= | 19 | CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= | |
20 | CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= | 20 | CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= | |
21 | CONFIGURE_ENV+= ac_cv_libexpat=no | 21 | CONFIGURE_ENV+= ac_cv_libexpat=no | |
22 | 22 | |||
23 | INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1 | 23 | INSTALLATION_DIRS+= lib | |
24 | TEST_TARGET= check | 24 | TEST_TARGET= check | |
25 | 25 | |||
26 | BROKEN_GETTEXT_DETECTION= yes | 26 | BROKEN_GETTEXT_DETECTION= yes | |
27 | USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib | 27 | USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib | |
28 | 28 | |||
29 | .include "../../mk/bsd.prefs.mk" | 29 | .include "../../mk/bsd.prefs.mk" | |
30 | 30 | |||
31 | PLIST_VARS+= glibc | 31 | PLIST_VARS+= glibc | |
32 | .if ${OPSYS} == "Linux" | 32 | .if ${OPSYS} == "Linux" | |
33 | PLIST.glibc= yes | 33 | PLIST.glibc= yes | |
34 | .endif | 34 | .endif | |
35 | 35 | |||
36 | do-install: | 36 | do-install: | |
37 | cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR} | 37 | cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR} | |
38 | cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR} | 38 | cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR} | |
39 | cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR} | 39 | cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR} | |
40 | cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR} | |||
41 | cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data DESTDIR=${DESTDIR} | |||
42 | 40 | |||
43 | .include "../../devel/gettext-lib/buildlink3.mk" | 41 | .include "../../devel/gettext-lib/buildlink3.mk" | |
44 | .include "../../devel/gettext-asprintf/buildlink3.mk" | 42 | .include "../../devel/gettext-asprintf/buildlink3.mk" | |
45 | .include "../../mk/bsd.pkg.mk" | 43 | .include "../../mk/bsd.pkg.mk" |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.14 2016/06/11 18:26:15 wiz Exp $ | 1 | # $NetBSD: Makefile.common,v 1.15 2019/05/27 13:21:41 ryoon Exp $ | |
2 | # | 2 | # | |
3 | # used by devel/gettext/Makefile | 3 | # used by devel/gettext/Makefile | |
4 | # used by devel/gettext-asprintf/Makefile | 4 | # used by devel/gettext-asprintf/Makefile | |
5 | # used by devel/gettext-lib/Makefile | 5 | # used by devel/gettext-lib/Makefile | |
6 | # used by devel/gettext-m4/Makefile | 6 | # used by devel/gettext-m4/Makefile | |
7 | # used by devel/gettext-tools/Makefile | 7 | # used by devel/gettext-tools/Makefile | |
8 | 8 | |||
9 | DISTNAME= gettext-0.19.8.1 | 9 | DISTNAME= gettext-0.20.1 | |
10 | CATEGORIES= devel | 10 | CATEGORIES= devel | |
11 | MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} | 11 | MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} | |
12 | 12 | |||
13 | MAINTAINER?= joerg@NetBSD.org | 13 | MAINTAINER?= joerg@NetBSD.org | |
14 | HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html | 14 | HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html | |
15 | LICENSE= gnu-gpl-v3 | 15 | LICENSE= gnu-gpl-v3 | |
16 | 16 | |||
17 | CONFLICTS= gettext<=0.10.35 | 17 | CONFLICTS= gettext<=0.10.35 | |
18 | 18 | |||
19 | USE_LIBTOOL= yes | 19 | USE_LIBTOOL= yes | |
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes |
@@ -1,82 +1,17 @@ | @@ -1,82 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.19 2017/06/26 21:22:49 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.20 2019/05/27 13:21:41 ryoon Exp $ | |
2 | ${PLIST.glibc}lib/preloadable_libintl.so | 2 | ${PLIST.glibc}lib/preloadable_libintl.so | |
3 | share/gettext/ABOUT-NLS | 3 | share/gettext/ABOUT-NLS | |
4 | share/gettext/config.rpath | 4 | share/gettext/config.rpath | |
5 | share/gettext/intl/COPYING.LIB | |||
6 | share/gettext/intl/Makefile.in | |||
7 | share/gettext/intl/VERSION | |||
8 | share/gettext/intl/bindtextdom.c | |||
9 | share/gettext/intl/config.charset | |||
10 | share/gettext/intl/dcgettext.c | |||
11 | share/gettext/intl/dcigettext.c | |||
12 | share/gettext/intl/dcngettext.c | |||
13 | share/gettext/intl/dgettext.c | |||
14 | share/gettext/intl/dngettext.c | |||
15 | share/gettext/intl/eval-plural.h | |||
16 | share/gettext/intl/explodename.c | |||
17 | share/gettext/intl/export.h | |||
18 | share/gettext/intl/finddomain.c | |||
19 | share/gettext/intl/gettext.c | |||
20 | share/gettext/intl/gettextP.h | |||
21 | share/gettext/intl/gmo.h | |||
22 | share/gettext/intl/hash-string.c | |||
23 | share/gettext/intl/hash-string.h | |||
24 | share/gettext/intl/intl-compat.c | |||
25 | share/gettext/intl/intl-exports.c | |||
26 | share/gettext/intl/l10nflist.c | |||
27 | share/gettext/intl/langprefs.c | |||
28 | share/gettext/intl/libgnuintl.in.h | |||
29 | share/gettext/intl/libintl.rc | |||
30 | share/gettext/intl/loadinfo.h | |||
31 | share/gettext/intl/loadmsgcat.c | |||
32 | share/gettext/intl/localcharset.c | |||
33 | share/gettext/intl/localcharset.h | |||
34 | share/gettext/intl/locale.alias | |||
35 | share/gettext/intl/localealias.c | |||
36 | share/gettext/intl/localename.c | |||
37 | share/gettext/intl/lock.c | |||
38 | share/gettext/intl/lock.h | |||
39 | share/gettext/intl/log.c | |||
40 | share/gettext/intl/ngettext.c | |||
41 | share/gettext/intl/os2compat.c | |||
42 | share/gettext/intl/os2compat.h | |||
43 | share/gettext/intl/osdep.c | |||
44 | share/gettext/intl/plural-exp.c | |||
45 | share/gettext/intl/plural-exp.h | |||
46 | share/gettext/intl/plural.c | |||
47 | share/gettext/intl/plural.y | |||
48 | share/gettext/intl/printf-args.c | |||
49 | share/gettext/intl/printf-args.h | |||
50 | share/gettext/intl/printf-parse.c | |||
51 | share/gettext/intl/printf-parse.h | |||
52 | share/gettext/intl/printf.c | |||
53 | share/gettext/intl/ref-add.sin | |||
54 | share/gettext/intl/ref-del.sin | |||
55 | share/gettext/intl/relocatable.c | |||
56 | share/gettext/intl/relocatable.h | |||
57 | share/gettext/intl/setlocale.c | |||
58 | share/gettext/intl/textdomain.c | |||
59 | share/gettext/intl/threadlib.c | |||
60 | share/gettext/intl/tsearch.c | |||
61 | share/gettext/intl/tsearch.h | |||
62 | share/gettext/intl/vasnprintf.c | |||
63 | share/gettext/intl/vasnprintf.h | |||
64 | share/gettext/intl/vasnwprintf.h | |||
65 | share/gettext/intl/verify.h | |||
66 | share/gettext/intl/version.c | |||
67 | share/gettext/intl/wprintf-parse.h | |||
68 | share/gettext/intl/xsize.c | |||
69 | share/gettext/intl/xsize.h | |||
70 | share/gettext/projects/GNOME/team-address | 5 | share/gettext/projects/GNOME/team-address | |
71 | share/gettext/projects/GNOME/teams.html | 6 | share/gettext/projects/GNOME/teams.html | |
72 | share/gettext/projects/GNOME/teams.url | 7 | share/gettext/projects/GNOME/teams.url | |
73 | share/gettext/projects/GNOME/trigger | 8 | share/gettext/projects/GNOME/trigger | |
74 | share/gettext/projects/KDE/team-address | 9 | share/gettext/projects/KDE/team-address | |
75 | share/gettext/projects/KDE/teams.html | 10 | share/gettext/projects/KDE/teams.html | |
76 | share/gettext/projects/KDE/teams.url | 11 | share/gettext/projects/KDE/teams.url | |
77 | share/gettext/projects/KDE/trigger | 12 | share/gettext/projects/KDE/trigger | |
78 | share/gettext/projects/TP/team-address | 13 | share/gettext/projects/TP/team-address | |
79 | share/gettext/projects/TP/teams.html | 14 | share/gettext/projects/TP/teams.html | |
80 | share/gettext/projects/TP/teams.url | 15 | share/gettext/projects/TP/teams.url | |
81 | share/gettext/projects/TP/trigger | 16 | share/gettext/projects/TP/trigger | |
82 | share/gettext/projects/index | 17 | share/gettext/projects/index |
@@ -1,18 +1,16 @@ | @@ -1,18 +1,16 @@ | |||
1 | $NetBSD: distinfo,v 1.36 2018/12/27 15:09:53 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.37 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784 | 3 | SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36 | |
4 | RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b | 4 | RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239 | |
5 | SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 | 5 | SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06 | |
6 | Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes | 6 | Size (gettext-0.20.1.tar.gz) = 23267473 bytes | |
7 | SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2 | 7 | SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2 | |
8 | SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0 | 8 | SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563 | |
9 | SHA1 (patch-ad) = 3e04eca9d824ed1bed282f3d49d5ce60ebac576f | |||
10 | SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c | 9 | SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c | |
11 | SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96 | 10 | SHA1 (patch-ag) = 339abdfbbd0f2f87de2a5f554bc1c13443551451 | |
12 | SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481 | 11 | SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92 | |
13 | SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c | |||
14 | SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c | 12 | SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c | |
15 | SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785 | 13 | SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054 | |
16 | SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f | 14 | SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f | |
17 | SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4 | 15 | SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4 | |
18 | SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679 | 16 | SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679 |
@@ -1,9 +1,8 @@ | @@ -1,9 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.33 2016/06/11 18:26:16 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.34 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784 | 3 | SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36 | |
4 | RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b | 4 | RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239 | |
5 | SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 | 5 | SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06 | |
6 | Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes | 6 | Size (gettext-0.20.1.tar.gz) = 23267473 bytes | |
7 | SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 | 7 | SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 | |
8 | SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7 | 8 | SHA1 (patch-ab) = 85ac0357dd3f977550fd0d51fce87e9ddbe42d07 | |
9 | SHA1 (patch-gettext-runtime_configure) = ca1955ca85a106b10e89e5575350372d879f7bfb |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ab,v 1.7 2013/07/26 13:08:32 ryoon Exp $ | 1 | $NetBSD: patch-ab,v 1.8 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | --- gettext-runtime/intl/Makefile.in.orig 2013-06-11 23:57:10.000000000 +0000 | 3 | --- gettext-runtime/intl/Makefile.in.orig 2019-05-12 15:08:36.000000000 +0000 | |
4 | +++ gettext-runtime/intl/Makefile.in | 4 | +++ gettext-runtime/intl/Makefile.in | |
5 | @@ -390,7 +390,7 @@ install-exec: all | 5 | @@ -1939,7 +1939,7 @@ intl-compat.lo: ../config.h $(srcdi | |
6 | $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ | 6 | @USE_INCLUDED_LIBINTL_TRUE@install-exec-libintl: libintl.la | |
7 | $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ | 7 | @USE_INCLUDED_LIBINTL_TRUE@ $(mkdir_p) $(DESTDIR)$(libdir) | |
8 | $(LIBTOOL) --mode=install \ | 8 | @USE_INCLUDED_LIBINTL_TRUE@ $(LIBTOOL) --mode=install \ | |
9 | - $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ | 9 | -@USE_INCLUDED_LIBINTL_TRUE@ $(INSTALL_DATA) libintl.la $(DESTDIR)$(libdir)/libintl.la; \ | |
10 | + $(BSD_INSTALL_LIB) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ | 10 | +@USE_INCLUDED_LIBINTL_TRUE@ $(BSD_INSTALL_LIB) libintl.la $(DESTDIR)$(libdir)/libintl.la; \ | |
11 | if test "@RELOCATABLE@" = yes; then \ | 11 | @USE_INCLUDED_LIBINTL_TRUE@ if test "@RELOCATABLE@" = yes; then \ | |
12 | dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ | 12 | @USE_INCLUDED_LIBINTL_TRUE@ dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ | |
13 | if test -n "$$dependencies"; then \ | 13 | @USE_INCLUDED_LIBINTL_TRUE@ if test -n "$$dependencies"; then \ |
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.23 2018/12/27 15:09:53 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.24 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | .include "../../devel/gettext/Makefile.common" | 3 | .include "../../devel/gettext/Makefile.common" | |
4 | 4 | |||
5 | PKGNAME= ${DISTNAME:S/-/-m4-/} | 5 | PKGNAME= ${DISTNAME:S/-/-m4-/} | |
6 | PKGREVISION= 1 | |||
7 | COMMENT= Autoconf/automake m4 files for GNU NLS library | 6 | COMMENT= Autoconf/automake m4 files for GNU NLS library | |
8 | LICENSE= gnu-gpl-v2 | 7 | LICENSE= gnu-gpl-v2 | |
9 | 8 | |||
10 | DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo | 9 | DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo | |
11 | PATCHDIR= ${.CURDIR}/../../devel/gettext/patches | 10 | PATCHDIR= ${.CURDIR}/../../devel/gettext/patches | |
12 | 11 | |||
13 | NO_BUILD= yes | 12 | NO_BUILD= yes | |
14 | NO_CONFIGURE= yes | 13 | NO_CONFIGURE= yes | |
15 | 14 | |||
16 | INSTALLATION_DIRS+= share/aclocal | 15 | INSTALLATION_DIRS+= share/aclocal | |
17 | 16 | |||
18 | do-install: | 17 | do-install: | |
19 | ${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \ | 18 | ${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \ | |
20 | ${DESTDIR}${PREFIX}/share/aclocal | 19 | ${DESTDIR}${PREFIX}/share/aclocal | |
21 | ${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \ | 20 | ${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \ | |
22 | ${DESTDIR}${PREFIX}/share/aclocal | 21 | ${DESTDIR}${PREFIX}/share/aclocal | |
23 | . for i in lib-ld.m4 lib-link.m4 lib-prefix.m4 | 22 | . for i in lib-ld.m4 lib-link.m4 lib-prefix.m4 extern-inline.m4 \ | |
23 | lock.m4 longlong.m4 lcmessage.m4 threadlib.m4 wchar_t.m4 \ | |||
24 | wint_t.m4 codeset.m4 | |||
24 | ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \ | 25 | ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \ | |
25 | ${DESTDIR}${PREFIX}/share/aclocal | 26 | ${DESTDIR}${PREFIX}/share/aclocal | |
26 | . endfor | 27 | . endfor | |
27 | 28 | |||
28 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,34 +1,35 @@ | @@ -1,34 +1,35 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:24 rillig Exp $ | 1 | @comment $NetBSD: PLIST,v 1.9 2019/05/27 13:21:41 ryoon Exp $ | |
2 | share/aclocal/codeset.m4 | 2 | share/aclocal/codeset.m4 | |
3 | share/aclocal/exported.m4 | 3 | share/aclocal/exported.m4 | |
4 | share/aclocal/extern-inline.m4 | 4 | share/aclocal/extern-inline.m4 | |
5 | share/aclocal/fcntl-o.m4 | 5 | share/aclocal/fcntl-o.m4 | |
6 | share/aclocal/flexmember.m4 | |||
6 | share/aclocal/gettext.m4 | 7 | share/aclocal/gettext.m4 | |
7 | share/aclocal/glibc2.m4 | 8 | share/aclocal/glibc2.m4 | |
8 | share/aclocal/glibc21.m4 | 9 | share/aclocal/glibc21.m4 | |
9 | share/aclocal/hostname.m4 | 10 | share/aclocal/hostname.m4 | |
10 | share/aclocal/iconv.m4 | 11 | share/aclocal/iconv.m4 | |
11 | share/aclocal/intdiv0.m4 | 12 | share/aclocal/intdiv0.m4 | |
12 | share/aclocal/intl.m4 | 13 | share/aclocal/intl.m4 | |
13 | share/aclocal/intldir.m4 | |||
14 | share/aclocal/intlmacosx.m4 | 14 | share/aclocal/intlmacosx.m4 | |
15 | share/aclocal/intmax.m4 | 15 | share/aclocal/intmax.m4 | |
16 | share/aclocal/inttypes-pri.m4 | 16 | share/aclocal/inttypes-pri.m4 | |
17 | share/aclocal/inttypes_h.m4 | 17 | share/aclocal/inttypes_h.m4 | |
18 | share/aclocal/lcmessage.m4 | 18 | share/aclocal/lcmessage.m4 | |
19 | share/aclocal/lib-ld.m4 | 19 | share/aclocal/lib-ld.m4 | |
20 | share/aclocal/lib-link.m4 | 20 | share/aclocal/lib-link.m4 | |
21 | share/aclocal/lib-prefix.m4 | 21 | share/aclocal/lib-prefix.m4 | |
22 | share/aclocal/locale-de.m4 | |||
22 | share/aclocal/lock.m4 | 23 | share/aclocal/lock.m4 | |
23 | share/aclocal/longlong.m4 | 24 | share/aclocal/longlong.m4 | |
24 | share/aclocal/nls.m4 | 25 | share/aclocal/nls.m4 | |
25 | share/aclocal/po.m4 | 26 | share/aclocal/po.m4 | |
26 | share/aclocal/printf-posix.m4 | 27 | share/aclocal/printf-posix.m4 | |
27 | share/aclocal/progtest.m4 | 28 | share/aclocal/progtest.m4 | |
28 | share/aclocal/setlocale.m4 | 29 | share/aclocal/setlocale.m4 | |
29 | share/aclocal/siginfo.m4 | 30 | share/aclocal/siginfo.m4 | |
30 | share/aclocal/size_max.m4 | 31 | share/aclocal/size_max.m4 | |
31 | share/aclocal/stdint_h.m4 | 32 | share/aclocal/stdint_h.m4 | |
32 | share/aclocal/threadlib.m4 | 33 | share/aclocal/threadlib.m4 | |
33 | share/aclocal/uintmax_t.m4 | 34 | share/aclocal/uintmax_t.m4 | |
34 | share/aclocal/visibility.m4 | 35 | share/aclocal/visibility.m4 |
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.36 2019/05/23 17:39:53 rillig Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | .include "../../devel/gettext/Makefile.common" | 3 | .include "../../devel/gettext/Makefile.common" | |
4 | 4 | |||
5 | PKGNAME= ${DISTNAME:S/-/-tools-/} | 5 | PKGNAME= ${DISTNAME:S/-/-tools-/} | |
6 | PKGREVISION= 1 | |||
7 | COMMENT= Tools for providing messages in different languages | 6 | COMMENT= Tools for providing messages in different languages | |
8 | 7 | |||
9 | DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo | |
10 | PATCHDIR= ${.CURDIR}/../../devel/gettext/patches | 9 | PATCHDIR= ${.CURDIR}/../../devel/gettext/patches | |
11 | 10 | |||
12 | USE_LANGUAGES= c c++ | 11 | USE_LANGUAGES= c c++ | |
13 | USE_TOOLS+= xz:run | 12 | USE_TOOLS+= xz:run | |
14 | USE_PKGLOCALEDIR= yes | 13 | USE_PKGLOCALEDIR= yes | |
15 | CONFIGURE_ARGS+= --disable-csharp | 14 | CONFIGURE_ARGS+= --disable-csharp | |
16 | CONFIGURE_ARGS+= --disable-java | 15 | CONFIGURE_ARGS+= --disable-java | |
17 | CONFIGURE_ARGS+= --with-included-libcroco | 16 | CONFIGURE_ARGS+= --with-included-libcroco | |
18 | CONFIGURE_ARGS+= --without-git | 17 | CONFIGURE_ARGS+= --without-git | |
19 | CONFIGURE_ARGS+= --with-xz | 18 | CONFIGURE_ARGS+= --with-xz |
@@ -1,46 +1,52 @@ | @@ -1,46 +1,52 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.13 2017/05/15 14:14:04 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.14 2019/05/27 13:21:41 ryoon Exp $ | |
2 | bin/autopoint | 2 | bin/autopoint | |
3 | bin/envsubst | 3 | bin/envsubst | |
4 | bin/gettext | 4 | bin/gettext | |
5 | bin/gettext.sh | 5 | bin/gettext.sh | |
6 | bin/gettextize | 6 | bin/gettextize | |
7 | bin/msgattrib | 7 | bin/msgattrib | |
8 | bin/msgcat | 8 | bin/msgcat | |
9 | bin/msgcmp | 9 | bin/msgcmp | |
10 | bin/msgcomm | 10 | bin/msgcomm | |
11 | bin/msgconv | 11 | bin/msgconv | |
12 | bin/msgen | 12 | bin/msgen | |
13 | bin/msgexec | 13 | bin/msgexec | |
14 | bin/msgfilter | 14 | bin/msgfilter | |
15 | bin/msgfmt | 15 | bin/msgfmt | |
16 | bin/msggrep | 16 | bin/msggrep | |
17 | bin/msginit | 17 | bin/msginit | |
18 | bin/msgmerge | 18 | bin/msgmerge | |
19 | bin/msgunfmt | 19 | bin/msgunfmt | |
20 | bin/msguniq | 20 | bin/msguniq | |
21 | bin/ngettext | 21 | bin/ngettext | |
22 | bin/recode-sr-latin | 22 | bin/recode-sr-latin | |
23 | bin/xgettext | 23 | bin/xgettext | |
24 | include/gettext-po.h | 24 | include/gettext-po.h | |
25 | include/textstyle.h | |||
26 | include/textstyle/stdbool.h | |||
27 | include/textstyle/version.h | |||
28 | include/textstyle/woe32dll.h | |||
25 | info/gettext.info | 29 | info/gettext.info | |
30 | info/libtextstyle.info | |||
26 | lib/gettext/cldr-plurals | 31 | lib/gettext/cldr-plurals | |
27 | lib/gettext/hostname | 32 | lib/gettext/hostname | |
28 | lib/gettext/project-id | 33 | lib/gettext/project-id | |
29 | lib/gettext/urlget | 34 | lib/gettext/urlget | |
30 | lib/gettext/user-email | 35 | lib/gettext/user-email | |
31 | lib/libgettextlib.la | 36 | lib/libgettextlib.la | |
32 | lib/libgettextpo.la | 37 | lib/libgettextpo.la | |
33 | lib/libgettextsrc.la | 38 | lib/libgettextsrc.la | |
39 | lib/libtextstyle.la | |||
34 | man/man1/autopoint.1 | 40 | man/man1/autopoint.1 | |
35 | man/man1/envsubst.1 | 41 | man/man1/envsubst.1 | |
36 | man/man1/gettext.1 | 42 | man/man1/gettext.1 | |
37 | man/man1/gettextize.1 | 43 | man/man1/gettextize.1 | |
38 | man/man1/msgattrib.1 | 44 | man/man1/msgattrib.1 | |
39 | man/man1/msgcat.1 | 45 | man/man1/msgcat.1 | |
40 | man/man1/msgcmp.1 | 46 | man/man1/msgcmp.1 | |
41 | man/man1/msgcomm.1 | 47 | man/man1/msgcomm.1 | |
42 | man/man1/msgconv.1 | 48 | man/man1/msgconv.1 | |
43 | man/man1/msgen.1 | 49 | man/man1/msgen.1 | |
44 | man/man1/msgexec.1 | 50 | man/man1/msgexec.1 | |
45 | man/man1/msgfilter.1 | 51 | man/man1/msgfilter.1 | |
46 | man/man1/msgfmt.1 | 52 | man/man1/msgfmt.1 | |
@@ -76,66 +82,82 @@ share/doc/gettext/gettext_13.html | @@ -76,66 +82,82 @@ share/doc/gettext/gettext_13.html | |||
76 | share/doc/gettext/gettext_14.html | 82 | share/doc/gettext/gettext_14.html | |
77 | share/doc/gettext/gettext_15.html | 83 | share/doc/gettext/gettext_15.html | |
78 | share/doc/gettext/gettext_16.html | 84 | share/doc/gettext/gettext_16.html | |
79 | share/doc/gettext/gettext_17.html | 85 | share/doc/gettext/gettext_17.html | |
80 | share/doc/gettext/gettext_18.html | 86 | share/doc/gettext/gettext_18.html | |
81 | share/doc/gettext/gettext_19.html | 87 | share/doc/gettext/gettext_19.html | |
82 | share/doc/gettext/gettext_2.html | 88 | share/doc/gettext/gettext_2.html | |
83 | share/doc/gettext/gettext_20.html | 89 | share/doc/gettext/gettext_20.html | |
84 | share/doc/gettext/gettext_21.html | 90 | share/doc/gettext/gettext_21.html | |
85 | share/doc/gettext/gettext_22.html | 91 | share/doc/gettext/gettext_22.html | |
86 | share/doc/gettext/gettext_23.html | 92 | share/doc/gettext/gettext_23.html | |
87 | share/doc/gettext/gettext_24.html | 93 | share/doc/gettext/gettext_24.html | |
88 | share/doc/gettext/gettext_25.html | 94 | share/doc/gettext/gettext_25.html | |
95 | share/doc/gettext/gettext_26.html | |||
96 | share/doc/gettext/gettext_27.html | |||
97 | share/doc/gettext/gettext_28.html | |||
98 | share/doc/gettext/gettext_29.html | |||
89 | share/doc/gettext/gettext_3.html | 99 | share/doc/gettext/gettext_3.html | |
100 | share/doc/gettext/gettext_30.html | |||
90 | share/doc/gettext/gettext_4.html | 101 | share/doc/gettext/gettext_4.html | |
91 | share/doc/gettext/gettext_5.html | 102 | share/doc/gettext/gettext_5.html | |
92 | share/doc/gettext/gettext_6.html | 103 | share/doc/gettext/gettext_6.html | |
93 | share/doc/gettext/gettext_7.html | 104 | share/doc/gettext/gettext_7.html | |
94 | share/doc/gettext/gettext_8.html | 105 | share/doc/gettext/gettext_8.html | |
95 | share/doc/gettext/gettext_9.html | 106 | share/doc/gettext/gettext_9.html | |
96 | share/doc/gettext/gettext_foot.html | 107 | share/doc/gettext/gettext_abt.html | |
108 | share/doc/gettext/gettext_fot.html | |||
97 | share/doc/gettext/gettext_toc.html | 109 | share/doc/gettext/gettext_toc.html | |
98 | share/doc/gettext/gettextize.1.html | 110 | share/doc/gettext/gettextize.1.html | |
99 | share/doc/gettext/msgattrib.1.html | 111 | share/doc/gettext/msgattrib.1.html | |
100 | share/doc/gettext/msgcat.1.html | 112 | share/doc/gettext/msgcat.1.html | |
101 | share/doc/gettext/msgcmp.1.html | 113 | share/doc/gettext/msgcmp.1.html | |
102 | share/doc/gettext/msgcomm.1.html | 114 | share/doc/gettext/msgcomm.1.html | |
103 | share/doc/gettext/msgconv.1.html | 115 | share/doc/gettext/msgconv.1.html | |
104 | share/doc/gettext/msgen.1.html | 116 | share/doc/gettext/msgen.1.html | |
105 | share/doc/gettext/msgexec.1.html | 117 | share/doc/gettext/msgexec.1.html | |
106 | share/doc/gettext/msgfilter.1.html | 118 | share/doc/gettext/msgfilter.1.html | |
107 | share/doc/gettext/msgfmt.1.html | 119 | share/doc/gettext/msgfmt.1.html | |
108 | share/doc/gettext/msggrep.1.html | 120 | share/doc/gettext/msggrep.1.html | |
109 | share/doc/gettext/msginit.1.html | 121 | share/doc/gettext/msginit.1.html | |
110 | share/doc/gettext/msgmerge.1.html | 122 | share/doc/gettext/msgmerge.1.html | |
111 | share/doc/gettext/msgunfmt.1.html | 123 | share/doc/gettext/msgunfmt.1.html | |
112 | share/doc/gettext/msguniq.1.html | 124 | share/doc/gettext/msguniq.1.html | |
113 | share/doc/gettext/ngettext.1.html | 125 | share/doc/gettext/ngettext.1.html | |
114 | share/doc/gettext/ngettext.3.html | 126 | share/doc/gettext/ngettext.3.html | |
115 | share/doc/gettext/recode-sr-latin.1.html | 127 | share/doc/gettext/recode-sr-latin.1.html | |
116 | share/doc/gettext/textdomain.3.html | 128 | share/doc/gettext/textdomain.3.html | |
117 | share/doc/gettext/tutorial.html | 129 | share/doc/gettext/tutorial.html | |
118 | share/doc/gettext/xgettext.1.html | 130 | share/doc/gettext/xgettext.1.html | |
119 | share/gettext-0.19.8/its/appdata.its | 131 | share/doc/libtextstyle/libtextstyle_1.html | |
120 | share/gettext-0.19.8/its/appdata.loc | 132 | share/doc/libtextstyle/libtextstyle_2.html | |
121 | share/gettext-0.19.8/its/glade.loc | 133 | share/doc/libtextstyle/libtextstyle_3.html | |
122 | share/gettext-0.19.8/its/glade1.its | 134 | share/doc/libtextstyle/libtextstyle_4.html | |
123 | share/gettext-0.19.8/its/glade2.its | 135 | share/doc/libtextstyle/libtextstyle_5.html | |
124 | share/gettext-0.19.8/its/gsettings.its | 136 | share/doc/libtextstyle/libtextstyle_6.html | |
125 | share/gettext-0.19.8/its/gsettings.loc | 137 | share/doc/libtextstyle/libtextstyle_7.html | |
126 | share/gettext-0.19.8/its/gtkbuilder.its | 138 | share/doc/libtextstyle/libtextstyle_abt.html | |
139 | share/doc/libtextstyle/libtextstyle_toc.html | |||
140 | share/gettext-0.20/its/glade.loc | |||
141 | share/gettext-0.20/its/glade1.its | |||
142 | share/gettext-0.20/its/glade2.its | |||
143 | share/gettext-0.20/its/gsettings.its | |||
144 | share/gettext-0.20/its/gsettings.loc | |||
145 | share/gettext-0.20/its/gtkbuilder.its | |||
146 | share/gettext-0.20/its/metainfo.its | |||
147 | share/gettext-0.20/its/metainfo.loc | |||
127 | share/gettext/archive.dir.tar.xz | 148 | share/gettext/archive.dir.tar.xz | |
128 | share/gettext/msgunfmt.tcl | 149 | share/gettext/msgunfmt.tcl | |
150 | share/locale/ast/LC_MESSAGES/gettext-runtime.mo | |||
129 | share/locale/be/LC_MESSAGES/gettext-runtime.mo | 151 | share/locale/be/LC_MESSAGES/gettext-runtime.mo | |
130 | share/locale/be/LC_MESSAGES/gettext-tools.mo | 152 | share/locale/be/LC_MESSAGES/gettext-tools.mo | |
131 | share/locale/bg/LC_MESSAGES/gettext-runtime.mo | 153 | share/locale/bg/LC_MESSAGES/gettext-runtime.mo | |
132 | share/locale/bg/LC_MESSAGES/gettext-tools.mo | 154 | share/locale/bg/LC_MESSAGES/gettext-tools.mo | |
133 | share/locale/ca/LC_MESSAGES/gettext-runtime.mo | 155 | share/locale/ca/LC_MESSAGES/gettext-runtime.mo | |
134 | share/locale/ca/LC_MESSAGES/gettext-tools.mo | 156 | share/locale/ca/LC_MESSAGES/gettext-tools.mo | |
135 | share/locale/cs/LC_MESSAGES/gettext-runtime.mo | 157 | share/locale/cs/LC_MESSAGES/gettext-runtime.mo | |
136 | share/locale/cs/LC_MESSAGES/gettext-tools.mo | 158 | share/locale/cs/LC_MESSAGES/gettext-tools.mo | |
137 | share/locale/da/LC_MESSAGES/gettext-runtime.mo | 159 | share/locale/da/LC_MESSAGES/gettext-runtime.mo | |
138 | share/locale/da/LC_MESSAGES/gettext-tools.mo | 160 | share/locale/da/LC_MESSAGES/gettext-tools.mo | |
139 | share/locale/de/LC_MESSAGES/gettext-runtime.mo | 161 | share/locale/de/LC_MESSAGES/gettext-runtime.mo | |
140 | share/locale/de/LC_MESSAGES/gettext-tools.mo | 162 | share/locale/de/LC_MESSAGES/gettext-tools.mo | |
141 | share/locale/el/LC_MESSAGES/gettext-runtime.mo | 163 | share/locale/el/LC_MESSAGES/gettext-runtime.mo |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | $NetBSD: patch-ad,v 1.6 2016/02/01 14:56:30 adam Exp $ | 1 | $NetBSD: patch-ad,v 1.7 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | --- gettext-tools/Makefile.in.orig 2015-12-27 23:09:39.000000000 +0000 | 3 | --- gettext-tools/Makefile.in.orig 2019-05-12 15:09:14.000000000 +0000 | |
4 | +++ gettext-tools/Makefile.in | 4 | +++ gettext-tools/Makefile.in | |
5 | @@ -1865,7 +1865,7 @@ top_builddir = @top_builddir@ | 5 | @@ -2016,7 +2016,7 @@ top_builddir = @top_builddir@ | |
6 | top_srcdir = @top_srcdir@ | 6 | top_srcdir = @top_srcdir@ | |
7 | AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies | 7 | AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies | |
8 | ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 | 8 | ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 | |
9 | -SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its | 9 | -SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc | |
10 | +SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po man tests | 10 | +SUBDIRS = intl gnulib-lib libgrep src libgettextpo po man tests system-tests doc | |
11 | 11 | |||
12 | # Allow users to use "gnulib-tool --update". | 12 | # Allow users to use "gnulib-tool --update". | |
13 | 13 | |||
14 | @@ -2370,8 +2370,7 @@ info: info-recursive | 14 | @@ -2522,8 +2522,7 @@ info: info-recursive | |
15 | 15 | |||
16 | info-am: | 16 | info-am: | |
17 | 17 | |||
18 | -install-data-am: install-examplesbuildauxDATA \ | 18 | -install-data-am: install-examplesbuildauxDATA \ | |
19 | - install-gettextsrcSCRIPTS | 19 | - install-gettextsrcSCRIPTS | |
20 | +install-data-am: | 20 | +install-data-am: | |
21 | 21 | |||
22 | install-dvi: install-dvi-recursive | 22 | install-dvi: install-dvi-recursive | |
23 | 23 |
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | $NetBSD: patch-aj,v 1.6 2013/01/31 21:45:04 adam Exp $ | 1 | $NetBSD: patch-aj,v 1.7 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | --- gettext-runtime/Makefile.in.orig 2012-12-25 05:30:40.000000000 +0000 | 3 | --- gettext-runtime/Makefile.in.orig 2012-12-25 05:30:40.000000000 +0000 | |
4 | +++ gettext-runtime/Makefile.in | 4 | +++ gettext-runtime/Makefile.in | |
5 | @@ -1159,7 +1159,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnul | 5 | @@ -1159,7 +1159,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnul | |
6 | # The list of subdirectories depends on whether --disable-libasprintf was | 6 | # The list of subdirectories depends on whether --disable-libasprintf was | |
7 | # specified. | 7 | # specified. | |
8 | @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf | 8 | @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf | |
9 | -SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests | 9 | -SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests | |
10 | +SUBDIRS = doc gnulib-lib src po man m4 tests | 10 | +SUBDIRS = doc intl gnulib-lib src po man m4 tests | |
11 | 11 | |||
12 | # Allow users to use "gnulib-tool --update". | 12 | # Allow users to use "gnulib-tool --update". | |
13 | 13 | |||
14 | @@ -1637,7 +1637,7 @@ info: info-recursive | 14 | @@ -1637,7 +1637,7 @@ info: info-recursive | |
15 | 15 | |||
16 | info-am: | 16 | info-am: | |
17 | 17 | |||
18 | -install-data-am: install-gettextsrcDATA | 18 | -install-data-am: install-gettextsrcDATA | |
19 | +install-data-am: | 19 | +install-data-am: | |
20 | 20 | |||
21 | install-dvi: install-dvi-recursive | 21 | install-dvi: install-dvi-recursive | |
22 | 22 |
@@ -1,36 +1,44 @@ | @@ -1,36 +1,44 @@ | |||
1 | $NetBSD: patch-ag,v 1.9 2013/01/31 21:45:04 adam Exp $ | 1 | $NetBSD: patch-ag,v 1.10 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | --- gettext-tools/gnulib-lib/Makefile.in.orig 2012-12-25 05:33:32.000000000 +0000 | 3 | --- gettext-tools/gnulib-lib/Makefile.in.orig 2019-05-12 15:09:15.000000000 +0000 | |
4 | +++ gettext-tools/gnulib-lib/Makefile.in | 4 | +++ gettext-tools/gnulib-lib/Makefile.in | |
5 | @@ -2935,7 +2935,7 @@ check: $(BUILT_SOURCES) | 5 | @@ -3255,7 +3255,7 @@ check: $(BUILT_SOURCES) | |
6 | $(MAKE) $(AM_MAKEFLAGS) check-am | 6 | $(MAKE) $(AM_MAKEFLAGS) check-am | |
7 | all-am: Makefile $(LTLIBRARIES) $(DATA) all-local | 7 | all-am: Makefile $(LTLIBRARIES) $(DATA) | |
8 | installdirs: | 8 | installdirs: | |
9 | - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)" "$(DESTDIR)$(pkgdatadir)"; do \ | 9 | - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)" "$(DESTDIR)$(pkgdatadir)"; do \ | |
10 | + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \ | 10 | + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \ | |
11 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | 11 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
12 | done | 12 | done | |
13 | install: $(BUILT_SOURCES) | 13 | install: $(BUILT_SOURCES) | |
14 | @@ -3007,7 +3007,7 @@ info: info-am | 14 | @@ -3326,13 +3326,13 @@ info: info-am | |
15 | 15 | |||
16 | info-am: | 16 | info-am: | |
17 | 17 | |||
18 | -install-data-am: install-gettextsrcDATA install-pkgdataDATA | 18 | -install-data-am: install-gettextsrcDATA install-pkgdataDATA | |
19 | +install-data-am: | 19 | +install-data-am: | |
20 | 20 | |||
21 | install-dvi: install-dvi-am | 21 | install-dvi: install-dvi-am | |
22 | 22 | |||
23 | @@ -3300,13 +3300,6 @@ getopt.h: getopt.in.h $(top_builddir)/co | 23 | install-dvi-am: | |
24 | ||||
25 | -install-exec-am: install-exec-local install-libLTLIBRARIES | |||
26 | +install-exec-am: install-libLTLIBRARIES | |||
27 | ||||
28 | install-html: install-html-am | |||
29 | ||||
30 | @@ -3608,14 +3608,6 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_ | |||
24 | } > $@-t && \ | 31 | } > $@-t && \ | |
25 | mv -f $@-t $@ | 32 | mv -f $@-t $@ | |
26 | 33 | |||
27 | -# No need to install libgettextlib.a, except on AIX. | 34 | -# No need to install libgettextlib.a, except on AIX. | |
28 | -install-exec-local: install-libLTLIBRARIES install-exec-clean | 35 | -install-exec-local: install-libLTLIBRARIES install-exec-clean | |
29 | -install-exec-clean: | 36 | -install-exec-clean: | |
30 | - case "@host_os@" in \ | 37 | - case "@host_os@" in \ | |
31 | - aix*) ;; \ | 38 | - aix*) ;; \ | |
32 | - *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \ | 39 | - *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \ | |
33 | - esac | 40 | - esac | |
34 | # This is a Makefile rule that generates multiple files at once; see the | 41 | - | |
35 | # automake documentation, node "Multiple Outputs", for details. | 42 | # We need the following in order to create <iconv.h> when the system | |
36 | html-ostream.h : $(top_srcdir)/../build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h | 43 | # doesn't have one that works with the given compiler. | |
44 | @GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-an,v 1.5 2016/02/01 14:56:30 adam Exp $ | 1 | $NetBSD: patch-an,v 1.6 2019/05/27 13:21:41 ryoon Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2015-12-27 23:09:49.000000000 +0000 | 3 | --- Makefile.in.orig 2019-05-12 15:09:24.000000000 +0000 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -312,7 +312,7 @@ top_builddir = @top_builddir@ | 5 | @@ -308,7 +308,7 @@ top_builddir = @top_builddir@ | |
6 | top_srcdir = @top_srcdir@ | 6 | top_srcdir = @top_srcdir@ | |
7 | AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies | 7 | AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies | |
8 | ACLOCAL_AMFLAGS = -I m4 | 8 | ACLOCAL_AMFLAGS = -I m4 | |
9 | -SUBDIRS = gnulib-local gettext-runtime gettext-tools | 9 | -SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools | |
10 | +SUBDIRS = gettext-runtime gettext-tools | 10 | +SUBDIRS = gettext-runtime libtextstyle gettext-tools | |
11 | changelog_etc = \ | 11 | changelog_etc = \ | |
12 | gettext-runtime/ChangeLog.0 \ | 12 | gettext-runtime/ChangeLog.0 \ | |
13 | gettext-runtime/doc/ChangeLog.0 \ | 13 | gettext-runtime/doc/ChangeLog.0 \ |