Mon May 27 13:21:41 2019 UTC ()
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.


(ryoon)
diff -r1.84 -r1.85 pkgsrc/devel/gettext/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/gettext/Makefile.common
diff -r1.19 -r1.20 pkgsrc/devel/gettext/PLIST
diff -r1.36 -r1.37 pkgsrc/devel/gettext/distinfo
diff -r1.33 -r1.34 pkgsrc/devel/gettext-lib/distinfo
diff -r1.7 -r1.8 pkgsrc/devel/gettext-lib/patches/patch-ab
diff -r1.1 -r0 pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_configure
diff -r1.23 -r1.24 pkgsrc/devel/gettext-m4/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/gettext-m4/PLIST
diff -r1.36 -r1.37 pkgsrc/devel/gettext-tools/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/gettext-tools/PLIST
diff -r1.9 -r0 pkgsrc/devel/gettext/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-aj
diff -r1.9 -r1.10 pkgsrc/devel/gettext/patches/patch-ag
diff -r1.7 -r0 pkgsrc/devel/gettext/patches/patch-ak
diff -r1.5 -r1.6 pkgsrc/devel/gettext/patches/patch-an

cvs diff -r1.84 -r1.85 pkgsrc/devel/gettext/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext/Makefile 2017/06/26 21:22:49 1.84
+++ pkgsrc/devel/gettext/Makefile 2019/05/27 13:21:41 1.85
@@ -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
5COMMENT= Tools for providing messages in different languages 5COMMENT= Tools for providing messages in different languages
6 6
7DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4 7DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4
8DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools 8DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools
9BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18 9BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18
10 10
11USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
12USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
13SHLIBTOOL_OVERRIDE= # empty 13SHLIBTOOL_OVERRIDE= # empty
14CONFIGURE_ARGS+= --disable-csharp 14CONFIGURE_ARGS+= --disable-csharp
15CONFIGURE_ARGS+= --without-git 15CONFIGURE_ARGS+= --without-git
16CONFIGURE_ARGS+= --without-included-gettext 16CONFIGURE_ARGS+= --without-included-gettext
17CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= 17CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ=
18CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= 18CONFIGURE_ENV+= HAVE_GCJ_IN_PATH=
19CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= 19CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH=
20CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= 20CONFIGURE_ENV+= HAVE_JIKES_IN_PATH=
21CONFIGURE_ENV+= ac_cv_libexpat=no 21CONFIGURE_ENV+= ac_cv_libexpat=no
22 22
23INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1 23INSTALLATION_DIRS+= lib
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26BROKEN_GETTEXT_DETECTION= yes 26BROKEN_GETTEXT_DETECTION= yes
27USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib 27USE_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
31PLIST_VARS+= glibc 31PLIST_VARS+= glibc
32.if ${OPSYS} == "Linux" 32.if ${OPSYS} == "Linux"
33PLIST.glibc= yes 33PLIST.glibc= yes
34.endif 34.endif
35 35
36do-install: 36do-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"

cvs diff -r1.14 -r1.15 pkgsrc/devel/gettext/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/gettext/Makefile.common 2016/06/11 18:26:15 1.14
+++ pkgsrc/devel/gettext/Makefile.common 2019/05/27 13:21:41 1.15
@@ -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
9DISTNAME= gettext-0.19.8.1 9DISTNAME= gettext-0.20.1
10CATEGORIES= devel 10CATEGORIES= devel
11MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} 11MASTER_SITES= ${MASTER_SITE_GNU:=gettext/}
12 12
13MAINTAINER?= joerg@NetBSD.org 13MAINTAINER?= joerg@NetBSD.org
14HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html 14HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17CONFLICTS= gettext<=0.10.35 17CONFLICTS= gettext<=0.10.35
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes

cvs diff -r1.19 -r1.20 pkgsrc/devel/gettext/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext/PLIST 2017/06/26 21:22:49 1.19
+++ pkgsrc/devel/gettext/PLIST 2019/05/27 13:21:41 1.20
@@ -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
3share/gettext/ABOUT-NLS 3share/gettext/ABOUT-NLS
4share/gettext/config.rpath 4share/gettext/config.rpath
5share/gettext/intl/COPYING.LIB 
6share/gettext/intl/Makefile.in 
7share/gettext/intl/VERSION 
8share/gettext/intl/bindtextdom.c 
9share/gettext/intl/config.charset 
10share/gettext/intl/dcgettext.c 
11share/gettext/intl/dcigettext.c 
12share/gettext/intl/dcngettext.c 
13share/gettext/intl/dgettext.c 
14share/gettext/intl/dngettext.c 
15share/gettext/intl/eval-plural.h 
16share/gettext/intl/explodename.c 
17share/gettext/intl/export.h 
18share/gettext/intl/finddomain.c 
19share/gettext/intl/gettext.c 
20share/gettext/intl/gettextP.h 
21share/gettext/intl/gmo.h 
22share/gettext/intl/hash-string.c 
23share/gettext/intl/hash-string.h 
24share/gettext/intl/intl-compat.c 
25share/gettext/intl/intl-exports.c 
26share/gettext/intl/l10nflist.c 
27share/gettext/intl/langprefs.c 
28share/gettext/intl/libgnuintl.in.h 
29share/gettext/intl/libintl.rc 
30share/gettext/intl/loadinfo.h 
31share/gettext/intl/loadmsgcat.c 
32share/gettext/intl/localcharset.c 
33share/gettext/intl/localcharset.h 
34share/gettext/intl/locale.alias 
35share/gettext/intl/localealias.c 
36share/gettext/intl/localename.c 
37share/gettext/intl/lock.c 
38share/gettext/intl/lock.h 
39share/gettext/intl/log.c 
40share/gettext/intl/ngettext.c 
41share/gettext/intl/os2compat.c 
42share/gettext/intl/os2compat.h 
43share/gettext/intl/osdep.c 
44share/gettext/intl/plural-exp.c 
45share/gettext/intl/plural-exp.h 
46share/gettext/intl/plural.c 
47share/gettext/intl/plural.y 
48share/gettext/intl/printf-args.c 
49share/gettext/intl/printf-args.h 
50share/gettext/intl/printf-parse.c 
51share/gettext/intl/printf-parse.h 
52share/gettext/intl/printf.c 
53share/gettext/intl/ref-add.sin 
54share/gettext/intl/ref-del.sin 
55share/gettext/intl/relocatable.c 
56share/gettext/intl/relocatable.h 
57share/gettext/intl/setlocale.c 
58share/gettext/intl/textdomain.c 
59share/gettext/intl/threadlib.c 
60share/gettext/intl/tsearch.c 
61share/gettext/intl/tsearch.h 
62share/gettext/intl/vasnprintf.c 
63share/gettext/intl/vasnprintf.h 
64share/gettext/intl/vasnwprintf.h 
65share/gettext/intl/verify.h 
66share/gettext/intl/version.c 
67share/gettext/intl/wprintf-parse.h 
68share/gettext/intl/xsize.c 
69share/gettext/intl/xsize.h 
70share/gettext/projects/GNOME/team-address 5share/gettext/projects/GNOME/team-address
71share/gettext/projects/GNOME/teams.html 6share/gettext/projects/GNOME/teams.html
72share/gettext/projects/GNOME/teams.url 7share/gettext/projects/GNOME/teams.url
73share/gettext/projects/GNOME/trigger 8share/gettext/projects/GNOME/trigger
74share/gettext/projects/KDE/team-address 9share/gettext/projects/KDE/team-address
75share/gettext/projects/KDE/teams.html 10share/gettext/projects/KDE/teams.html
76share/gettext/projects/KDE/teams.url 11share/gettext/projects/KDE/teams.url
77share/gettext/projects/KDE/trigger 12share/gettext/projects/KDE/trigger
78share/gettext/projects/TP/team-address 13share/gettext/projects/TP/team-address
79share/gettext/projects/TP/teams.html 14share/gettext/projects/TP/teams.html
80share/gettext/projects/TP/teams.url 15share/gettext/projects/TP/teams.url
81share/gettext/projects/TP/trigger 16share/gettext/projects/TP/trigger
82share/gettext/projects/index 17share/gettext/projects/index

cvs diff -r1.36 -r1.37 pkgsrc/devel/gettext/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext/distinfo 2018/12/27 15:09:53 1.36
+++ pkgsrc/devel/gettext/distinfo 2019/05/27 13:21:41 1.37
@@ -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
3SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784 3SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
4RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b 4RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239
5SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 5SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
6Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes 6Size (gettext-0.20.1.tar.gz) = 23267473 bytes
7SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2 7SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
8SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0 8SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563
9SHA1 (patch-ad) = 3e04eca9d824ed1bed282f3d49d5ce60ebac576f 
10SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c 9SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
11SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96 10SHA1 (patch-ag) = 339abdfbbd0f2f87de2a5f554bc1c13443551451
12SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481 11SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92
13SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c 
14SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c 12SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
15SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785 13SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054
16SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f 14SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
17SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4 15SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
18SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679 16SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679

cvs diff -r1.33 -r1.34 pkgsrc/devel/gettext-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/distinfo 2016/06/11 18:26:16 1.33
+++ pkgsrc/devel/gettext-lib/distinfo 2019/05/27 13:21:41 1.34
@@ -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
3SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784 3SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
4RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b 4RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239
5SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 5SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
6Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes 6Size (gettext-0.20.1.tar.gz) = 23267473 bytes
7SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 7SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7
8SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7 8SHA1 (patch-ab) = 85ac0357dd3f977550fd0d51fce87e9ddbe42d07
9SHA1 (patch-gettext-runtime_configure) = ca1955ca85a106b10e89e5575350372d879f7bfb 

cvs diff -r1.7 -r1.8 pkgsrc/devel/gettext-lib/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/patches/Attic/patch-ab 2013/07/26 13:08:32 1.7
+++ pkgsrc/devel/gettext-lib/patches/Attic/patch-ab 2019/05/27 13:21:41 1.8
@@ -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 \

File Deleted: pkgsrc/devel/gettext-lib/patches/Attic/patch-gettext-runtime_configure

cvs diff -r1.23 -r1.24 pkgsrc/devel/gettext-m4/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext-m4/Makefile 2018/12/27 15:09:53 1.23
+++ pkgsrc/devel/gettext-m4/Makefile 2019/05/27 13:21:41 1.24
@@ -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
5PKGNAME= ${DISTNAME:S/-/-m4-/} 5PKGNAME= ${DISTNAME:S/-/-m4-/}
6PKGREVISION= 1 
7COMMENT= Autoconf/automake m4 files for GNU NLS library 6COMMENT= Autoconf/automake m4 files for GNU NLS library
8LICENSE= gnu-gpl-v2 7LICENSE= gnu-gpl-v2
9 8
10DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo 9DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
11PATCHDIR= ${.CURDIR}/../../devel/gettext/patches 10PATCHDIR= ${.CURDIR}/../../devel/gettext/patches
12 11
13NO_BUILD= yes 12NO_BUILD= yes
14NO_CONFIGURE= yes 13NO_CONFIGURE= yes
15 14
16INSTALLATION_DIRS+= share/aclocal 15INSTALLATION_DIRS+= share/aclocal
17 16
18do-install: 17do-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"

cvs diff -r1.8 -r1.9 pkgsrc/devel/gettext-m4/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext-m4/PLIST 2018/01/01 22:29:24 1.8
+++ pkgsrc/devel/gettext-m4/PLIST 2019/05/27 13:21:41 1.9
@@ -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 $
2share/aclocal/codeset.m4 2share/aclocal/codeset.m4
3share/aclocal/exported.m4 3share/aclocal/exported.m4
4share/aclocal/extern-inline.m4 4share/aclocal/extern-inline.m4
5share/aclocal/fcntl-o.m4 5share/aclocal/fcntl-o.m4
 6share/aclocal/flexmember.m4
6share/aclocal/gettext.m4 7share/aclocal/gettext.m4
7share/aclocal/glibc2.m4 8share/aclocal/glibc2.m4
8share/aclocal/glibc21.m4 9share/aclocal/glibc21.m4
9share/aclocal/hostname.m4 10share/aclocal/hostname.m4
10share/aclocal/iconv.m4 11share/aclocal/iconv.m4
11share/aclocal/intdiv0.m4 12share/aclocal/intdiv0.m4
12share/aclocal/intl.m4 13share/aclocal/intl.m4
13share/aclocal/intldir.m4 
14share/aclocal/intlmacosx.m4 14share/aclocal/intlmacosx.m4
15share/aclocal/intmax.m4 15share/aclocal/intmax.m4
16share/aclocal/inttypes-pri.m4 16share/aclocal/inttypes-pri.m4
17share/aclocal/inttypes_h.m4 17share/aclocal/inttypes_h.m4
18share/aclocal/lcmessage.m4 18share/aclocal/lcmessage.m4
19share/aclocal/lib-ld.m4 19share/aclocal/lib-ld.m4
20share/aclocal/lib-link.m4 20share/aclocal/lib-link.m4
21share/aclocal/lib-prefix.m4 21share/aclocal/lib-prefix.m4
 22share/aclocal/locale-de.m4
22share/aclocal/lock.m4 23share/aclocal/lock.m4
23share/aclocal/longlong.m4 24share/aclocal/longlong.m4
24share/aclocal/nls.m4 25share/aclocal/nls.m4
25share/aclocal/po.m4 26share/aclocal/po.m4
26share/aclocal/printf-posix.m4 27share/aclocal/printf-posix.m4
27share/aclocal/progtest.m4 28share/aclocal/progtest.m4
28share/aclocal/setlocale.m4 29share/aclocal/setlocale.m4
29share/aclocal/siginfo.m4 30share/aclocal/siginfo.m4
30share/aclocal/size_max.m4 31share/aclocal/size_max.m4
31share/aclocal/stdint_h.m4 32share/aclocal/stdint_h.m4
32share/aclocal/threadlib.m4 33share/aclocal/threadlib.m4
33share/aclocal/uintmax_t.m4 34share/aclocal/uintmax_t.m4
34share/aclocal/visibility.m4 35share/aclocal/visibility.m4

cvs diff -r1.36 -r1.37 pkgsrc/devel/gettext-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext-tools/Makefile 2019/05/23 17:39:53 1.36
+++ pkgsrc/devel/gettext-tools/Makefile 2019/05/27 13:21:41 1.37
@@ -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
5PKGNAME= ${DISTNAME:S/-/-tools-/} 5PKGNAME= ${DISTNAME:S/-/-tools-/}
6PKGREVISION= 1 
7COMMENT= Tools for providing messages in different languages 6COMMENT= Tools for providing messages in different languages
8 7
9DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
10PATCHDIR= ${.CURDIR}/../../devel/gettext/patches 9PATCHDIR= ${.CURDIR}/../../devel/gettext/patches
11 10
12USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
13USE_TOOLS+= xz:run 12USE_TOOLS+= xz:run
14USE_PKGLOCALEDIR= yes 13USE_PKGLOCALEDIR= yes
15CONFIGURE_ARGS+= --disable-csharp 14CONFIGURE_ARGS+= --disable-csharp
16CONFIGURE_ARGS+= --disable-java 15CONFIGURE_ARGS+= --disable-java
17CONFIGURE_ARGS+= --with-included-libcroco 16CONFIGURE_ARGS+= --with-included-libcroco
18CONFIGURE_ARGS+= --without-git 17CONFIGURE_ARGS+= --without-git
19CONFIGURE_ARGS+= --with-xz 18CONFIGURE_ARGS+= --with-xz

cvs diff -r1.13 -r1.14 pkgsrc/devel/gettext-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext-tools/PLIST 2017/05/15 14:14:04 1.13
+++ pkgsrc/devel/gettext-tools/PLIST 2019/05/27 13:21:41 1.14
@@ -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 $
2bin/autopoint 2bin/autopoint
3bin/envsubst 3bin/envsubst
4bin/gettext 4bin/gettext
5bin/gettext.sh 5bin/gettext.sh
6bin/gettextize 6bin/gettextize
7bin/msgattrib 7bin/msgattrib
8bin/msgcat 8bin/msgcat
9bin/msgcmp 9bin/msgcmp
10bin/msgcomm 10bin/msgcomm
11bin/msgconv 11bin/msgconv
12bin/msgen 12bin/msgen
13bin/msgexec 13bin/msgexec
14bin/msgfilter 14bin/msgfilter
15bin/msgfmt 15bin/msgfmt
16bin/msggrep 16bin/msggrep
17bin/msginit 17bin/msginit
18bin/msgmerge 18bin/msgmerge
19bin/msgunfmt 19bin/msgunfmt
20bin/msguniq 20bin/msguniq
21bin/ngettext 21bin/ngettext
22bin/recode-sr-latin 22bin/recode-sr-latin
23bin/xgettext 23bin/xgettext
24include/gettext-po.h 24include/gettext-po.h
 25include/textstyle.h
 26include/textstyle/stdbool.h
 27include/textstyle/version.h
 28include/textstyle/woe32dll.h
25info/gettext.info 29info/gettext.info
 30info/libtextstyle.info
26lib/gettext/cldr-plurals 31lib/gettext/cldr-plurals
27lib/gettext/hostname 32lib/gettext/hostname
28lib/gettext/project-id 33lib/gettext/project-id
29lib/gettext/urlget 34lib/gettext/urlget
30lib/gettext/user-email 35lib/gettext/user-email
31lib/libgettextlib.la 36lib/libgettextlib.la
32lib/libgettextpo.la 37lib/libgettextpo.la
33lib/libgettextsrc.la 38lib/libgettextsrc.la
 39lib/libtextstyle.la
34man/man1/autopoint.1 40man/man1/autopoint.1
35man/man1/envsubst.1 41man/man1/envsubst.1
36man/man1/gettext.1 42man/man1/gettext.1
37man/man1/gettextize.1 43man/man1/gettextize.1
38man/man1/msgattrib.1 44man/man1/msgattrib.1
39man/man1/msgcat.1 45man/man1/msgcat.1
40man/man1/msgcmp.1 46man/man1/msgcmp.1
41man/man1/msgcomm.1 47man/man1/msgcomm.1
42man/man1/msgconv.1 48man/man1/msgconv.1
43man/man1/msgen.1 49man/man1/msgen.1
44man/man1/msgexec.1 50man/man1/msgexec.1
45man/man1/msgfilter.1 51man/man1/msgfilter.1
46man/man1/msgfmt.1 52man/man1/msgfmt.1
@@ -76,66 +82,82 @@ share/doc/gettext/gettext_13.html @@ -76,66 +82,82 @@ share/doc/gettext/gettext_13.html
76share/doc/gettext/gettext_14.html 82share/doc/gettext/gettext_14.html
77share/doc/gettext/gettext_15.html 83share/doc/gettext/gettext_15.html
78share/doc/gettext/gettext_16.html 84share/doc/gettext/gettext_16.html
79share/doc/gettext/gettext_17.html 85share/doc/gettext/gettext_17.html
80share/doc/gettext/gettext_18.html 86share/doc/gettext/gettext_18.html
81share/doc/gettext/gettext_19.html 87share/doc/gettext/gettext_19.html
82share/doc/gettext/gettext_2.html 88share/doc/gettext/gettext_2.html
83share/doc/gettext/gettext_20.html 89share/doc/gettext/gettext_20.html
84share/doc/gettext/gettext_21.html 90share/doc/gettext/gettext_21.html
85share/doc/gettext/gettext_22.html 91share/doc/gettext/gettext_22.html
86share/doc/gettext/gettext_23.html 92share/doc/gettext/gettext_23.html
87share/doc/gettext/gettext_24.html 93share/doc/gettext/gettext_24.html
88share/doc/gettext/gettext_25.html 94share/doc/gettext/gettext_25.html
 95share/doc/gettext/gettext_26.html
 96share/doc/gettext/gettext_27.html
 97share/doc/gettext/gettext_28.html
 98share/doc/gettext/gettext_29.html
89share/doc/gettext/gettext_3.html 99share/doc/gettext/gettext_3.html
 100share/doc/gettext/gettext_30.html
90share/doc/gettext/gettext_4.html 101share/doc/gettext/gettext_4.html
91share/doc/gettext/gettext_5.html 102share/doc/gettext/gettext_5.html
92share/doc/gettext/gettext_6.html 103share/doc/gettext/gettext_6.html
93share/doc/gettext/gettext_7.html 104share/doc/gettext/gettext_7.html
94share/doc/gettext/gettext_8.html 105share/doc/gettext/gettext_8.html
95share/doc/gettext/gettext_9.html 106share/doc/gettext/gettext_9.html
96share/doc/gettext/gettext_foot.html 107share/doc/gettext/gettext_abt.html
 108share/doc/gettext/gettext_fot.html
97share/doc/gettext/gettext_toc.html 109share/doc/gettext/gettext_toc.html
98share/doc/gettext/gettextize.1.html 110share/doc/gettext/gettextize.1.html
99share/doc/gettext/msgattrib.1.html 111share/doc/gettext/msgattrib.1.html
100share/doc/gettext/msgcat.1.html 112share/doc/gettext/msgcat.1.html
101share/doc/gettext/msgcmp.1.html 113share/doc/gettext/msgcmp.1.html
102share/doc/gettext/msgcomm.1.html 114share/doc/gettext/msgcomm.1.html
103share/doc/gettext/msgconv.1.html 115share/doc/gettext/msgconv.1.html
104share/doc/gettext/msgen.1.html 116share/doc/gettext/msgen.1.html
105share/doc/gettext/msgexec.1.html 117share/doc/gettext/msgexec.1.html
106share/doc/gettext/msgfilter.1.html 118share/doc/gettext/msgfilter.1.html
107share/doc/gettext/msgfmt.1.html 119share/doc/gettext/msgfmt.1.html
108share/doc/gettext/msggrep.1.html 120share/doc/gettext/msggrep.1.html
109share/doc/gettext/msginit.1.html 121share/doc/gettext/msginit.1.html
110share/doc/gettext/msgmerge.1.html 122share/doc/gettext/msgmerge.1.html
111share/doc/gettext/msgunfmt.1.html 123share/doc/gettext/msgunfmt.1.html
112share/doc/gettext/msguniq.1.html 124share/doc/gettext/msguniq.1.html
113share/doc/gettext/ngettext.1.html 125share/doc/gettext/ngettext.1.html
114share/doc/gettext/ngettext.3.html 126share/doc/gettext/ngettext.3.html
115share/doc/gettext/recode-sr-latin.1.html 127share/doc/gettext/recode-sr-latin.1.html
116share/doc/gettext/textdomain.3.html 128share/doc/gettext/textdomain.3.html
117share/doc/gettext/tutorial.html 129share/doc/gettext/tutorial.html
118share/doc/gettext/xgettext.1.html 130share/doc/gettext/xgettext.1.html
119share/gettext-0.19.8/its/appdata.its 131share/doc/libtextstyle/libtextstyle_1.html
120share/gettext-0.19.8/its/appdata.loc 132share/doc/libtextstyle/libtextstyle_2.html
121share/gettext-0.19.8/its/glade.loc 133share/doc/libtextstyle/libtextstyle_3.html
122share/gettext-0.19.8/its/glade1.its 134share/doc/libtextstyle/libtextstyle_4.html
123share/gettext-0.19.8/its/glade2.its 135share/doc/libtextstyle/libtextstyle_5.html
124share/gettext-0.19.8/its/gsettings.its 136share/doc/libtextstyle/libtextstyle_6.html
125share/gettext-0.19.8/its/gsettings.loc 137share/doc/libtextstyle/libtextstyle_7.html
126share/gettext-0.19.8/its/gtkbuilder.its 138share/doc/libtextstyle/libtextstyle_abt.html
 139share/doc/libtextstyle/libtextstyle_toc.html
 140share/gettext-0.20/its/glade.loc
 141share/gettext-0.20/its/glade1.its
 142share/gettext-0.20/its/glade2.its
 143share/gettext-0.20/its/gsettings.its
 144share/gettext-0.20/its/gsettings.loc
 145share/gettext-0.20/its/gtkbuilder.its
 146share/gettext-0.20/its/metainfo.its
 147share/gettext-0.20/its/metainfo.loc
127share/gettext/archive.dir.tar.xz 148share/gettext/archive.dir.tar.xz
128share/gettext/msgunfmt.tcl 149share/gettext/msgunfmt.tcl
 150share/locale/ast/LC_MESSAGES/gettext-runtime.mo
129share/locale/be/LC_MESSAGES/gettext-runtime.mo 151share/locale/be/LC_MESSAGES/gettext-runtime.mo
130share/locale/be/LC_MESSAGES/gettext-tools.mo 152share/locale/be/LC_MESSAGES/gettext-tools.mo
131share/locale/bg/LC_MESSAGES/gettext-runtime.mo 153share/locale/bg/LC_MESSAGES/gettext-runtime.mo
132share/locale/bg/LC_MESSAGES/gettext-tools.mo 154share/locale/bg/LC_MESSAGES/gettext-tools.mo
133share/locale/ca/LC_MESSAGES/gettext-runtime.mo 155share/locale/ca/LC_MESSAGES/gettext-runtime.mo
134share/locale/ca/LC_MESSAGES/gettext-tools.mo 156share/locale/ca/LC_MESSAGES/gettext-tools.mo
135share/locale/cs/LC_MESSAGES/gettext-runtime.mo 157share/locale/cs/LC_MESSAGES/gettext-runtime.mo
136share/locale/cs/LC_MESSAGES/gettext-tools.mo 158share/locale/cs/LC_MESSAGES/gettext-tools.mo
137share/locale/da/LC_MESSAGES/gettext-runtime.mo 159share/locale/da/LC_MESSAGES/gettext-runtime.mo
138share/locale/da/LC_MESSAGES/gettext-tools.mo 160share/locale/da/LC_MESSAGES/gettext-tools.mo
139share/locale/de/LC_MESSAGES/gettext-runtime.mo 161share/locale/de/LC_MESSAGES/gettext-runtime.mo
140share/locale/de/LC_MESSAGES/gettext-tools.mo 162share/locale/de/LC_MESSAGES/gettext-tools.mo
141share/locale/el/LC_MESSAGES/gettext-runtime.mo 163share/locale/el/LC_MESSAGES/gettext-runtime.mo

File Deleted: pkgsrc/devel/gettext/patches/Attic/patch-ab

cvs diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-ad 2016/02/01 14:56:30 1.6
+++ pkgsrc/devel/gettext/patches/patch-ad 2019/05/27 13:21:41 1.7
@@ -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

cvs diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-aj 2013/01/31 21:45:04 1.6
+++ pkgsrc/devel/gettext/patches/patch-aj 2019/05/27 13:21:41 1.7
@@ -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

cvs diff -r1.9 -r1.10 pkgsrc/devel/gettext/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-ag 2013/01/31 21:45:04 1.9
+++ pkgsrc/devel/gettext/patches/patch-ag 2019/05/27 13:21:41 1.10
@@ -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)

File Deleted: pkgsrc/devel/gettext/patches/Attic/patch-ak

cvs diff -r1.5 -r1.6 pkgsrc/devel/gettext/patches/patch-an (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-an 2016/02/01 14:56:30 1.5
+++ pkgsrc/devel/gettext/patches/patch-an 2019/05/27 13:21:41 1.6
@@ -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 \