Attachment #213537 for bug #245724

View | Details | Raw Unified | Return to bug 245724
Collapse All | Expand All

Lines 4-10 Link Here

(-)devel/gettext/Makefile.common (-1 / +1 lines)
4	# experimental ports run. Untested commits may be backed out at portmgr's	4	# experimental ports run. Untested commits may be backed out at portmgr's
5	# discretion.	5	# discretion.
6		6
7	PORTVERSION= 0.20.1	7	PORTVERSION= 0.20.2
8	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.	8	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
9	CATEGORIES= devel	9	CATEGORIES= devel
10	MASTER_SITES= GNU/gettext	10	MASTER_SITES= GNU/gettext

Lines 1-3 Link Here

(-)devel/gettext/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557680234	1	TIMESTAMP = 1587038089
2	SHA256 (gettext-0.20.1.tar.xz) = 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800	2	SHA256 (gettext-0.20.2.tar.xz) = b22b818e644c37f6e3d1643a1943c32c3a9bff726d601e53047d2682019ceaba
3	SIZE (gettext-0.20.1.tar.xz) = 9346544	3	SIZE (gettext-0.20.2.tar.xz) = 9514892

Lines 1-11 Link Here

(-)devel/gettext-runtime/files/patch-configure (-7 / +7 lines)
1	--- configure.orig 2019-05-12 15:08:34 UTC	1	--- configure.orig 2020-04-14 04:45:37 UTC
2	+++ configure	2	+++ configure
3	@@ -17215,7 +17215,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the	3	@@ -16914,7 +16914,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the
4	# On Solaris 10 or newer, this test is no longer needed, because	4	# On Solaris 10 or newer, this test is no longer needed, because
5	# libc contains the fully functional pthread functions.	5	# libc contains the fully functional pthread functions.
6	case "$host_os" in	6	case "$host_os" in
7	- solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux*)	7	- solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux*)
8	+ solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux* \| freebsd*)	8	+ solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux* \| freebsd*)
9		9
10	$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h	10	$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
11		11

Lines 11-17 lib/libasprintf.so.0.0.0 Link Here

(-)devel/gettext-runtime/pkg-plist (-1 / +1 lines)
11	lib/libintl.a	11	lib/libintl.a
12	lib/libintl.so	12	lib/libintl.so
13	lib/libintl.so.8	13	lib/libintl.so.8
14	lib/libintl.so.8.1.6	14	lib/libintl.so.8.1.7
15	man/man1/envsubst.1.gz	15	man/man1/envsubst.1.gz
16	man/man1/gettext.1.gz	16	man/man1/gettext.1.gz
17	man/man1/ngettext.1.gz	17	man/man1/ngettext.1.gz

Lines 5-11 Link Here

(-)devel/gettext-tools/Makefile (-2 / +2 lines)
5	# discretion.	5	# discretion.
6		6
7	PORTNAME= gettext-tools	7	PORTNAME= gettext-tools
8	PORTREVISION= 1	8	PORTREVISION= 0
9		9
10	COMMENT= GNU gettext development and translation tools	10	COMMENT= GNU gettext development and translation tools
11		11
Lines 34-40 WRKSRC_SUBDIR= gettext-tools Link Here
34		34
35	DATADIR= ${PREFIX}/share/gettext	35	DATADIR= ${PREFIX}/share/gettext
36	DOCSDIR= ${PREFIX}/share/doc/gettext	36	DOCSDIR= ${PREFIX}/share/doc/gettext
37	PLIST_SUB= PORTVERSION=${PORTVERSION} VERSION=${PORTVERSION:R}	37	PLIST_SUB= PORTVERSION=${PORTVERSION} VERSION=${PORTVERSION}
38		38
39	INFO= gettext	39	INFO= gettext
40		40




--- configure.orig	2020-04-14 01:34:46 UTC
+++ configure
@@ -19457,7 +19457,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the
            # On Solaris 10 or newer, this test is no longer needed, because
            # libc contains the fully functional pthread functions.
            case "$host_os" in
-             solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
+             solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
 
 $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
@@ -24468,7 +24468,7 @@ $as_echo "$ac_res" >&6; }
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \




From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 19 May 2019 13:10:06 +0200
Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
 translations.

Reported by Don Lawrence <dlawrence@iecok.com>
in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html>
via Daiki Ueno
in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>.

* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
is true.
* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
---
 gettext-tools/src/msgmerge.c    |  4 ++--
 gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index cd762c0..92c9b7a 100644
--- src/msgmerge.c
+++ src/msgmerge.c
@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
   else
     {
       /* Write the merged message list out.  */
-      msgdomain_list_print (result, output_file, output_syntax, force_po,
-                            false);
+      msgdomain_list_print (result, output_file, output_syntax,
+                            for_msgfmt || force_po, false);
     }
 
   exit (EXIT_SUCCESS);
diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
index cd3862e..b86f7a0 100755
--- tests/msgmerge-26
+++ tests/msgmerge-26
@@ -73,7 +73,37 @@ msgstr "Papaya"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test26.ok mm-test26.out
-result=$?
+${DIFF} mm-test26.ok mm-test26.out || Exit 1
 
-exit $result
+# Test with a PO file that has no translated messages.
+
+cat <<\EOF > mm-test26a.in1
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "Hello world"
+msgstr "Hallo Welt"
+EOF
+
+cat <<\EOF > mm-test26a.in2
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ASCII\n"
+
+msgid "Hello, world!"
+msgstr ""
+EOF
+
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
+    || Exit 1
+LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
+
+cat <<\EOF > mm-test26a.ok
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+EOF
+
+: ${DIFF=diff}
+${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
-- 
1.9.1




lib/libgettextpo.a
lib/libgettextpo.so
lib/libgettextpo.so.0
lib/libgettextpo.so.0.5.6
lib/libgettextsrc-%%PORTVERSION%%.so
lib/libgettextsrc.so
man/man1/autopoint.1.gz

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-gnome/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-kde/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-qt/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++-wxwidgets/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome3/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-clisp/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp-forms/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-csharp/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-gawk/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-guile/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-awt/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-qtjambi/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java-swing/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-java/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-librep/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnome/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc-gnustep/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-objc/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-pascal/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-perl/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-php/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-python/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-sh/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-smalltalk/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl-tk/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-tcl/po/ta.po

%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/ru.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/sk.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/sl.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/sq.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/sr.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/sv.po
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-ycp/po/ta.po

%%DATADIR%%-%%VERSION%%/its/metainfo.loc
%%DATADIR%%/archive.dir.tar.xz
%%DATADIR%%/config.rpath
%%DATADIR%%/gettext.h
%%DATADIR%%/javaversion.class
%%DATADIR%%/msgunfmt.tcl
%%DATADIR%%/po/Makefile.in.in

Lines 5-11 include/textstyle/woe32dll.h Link Here

(-)devel/libtextstyle/pkg-plist (-1 / +1 lines)
5	lib/libtextstyle.a	5	lib/libtextstyle.a
6	lib/libtextstyle.so	6	lib/libtextstyle.so
7	lib/libtextstyle.so.0	7	lib/libtextstyle.so.0
8	lib/libtextstyle.so.0.0.0	8	lib/libtextstyle.so.0.0.1
9	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html	9	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html
10	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html	10	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html
11	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html	11	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html

Return to bug 245724

Lines 1-15 Link Here

(-)devel/gettext-tools/files/patch-configure (-8 / +8 lines)
1	--- configure.orig 2019-05-12 15:09:13 UTC	1	--- configure.orig 2020-04-14 01:34:46 UTC
2	+++ configure	2	+++ configure
3	@@ -19449,7 +19449,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the	3	@@ -19457,7 +19457,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the
4	# On Solaris 10 or newer, this test is no longer needed, because	4	# On Solaris 10 or newer, this test is no longer needed, because
5	# libc contains the fully functional pthread functions.	5	# libc contains the fully functional pthread functions.
6	case "$host_os" in	6	case "$host_os" in
7	- solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux*)	7	- solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux*)
8	+ solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux* \| freebsd*)	8	+ solaris \| solaris2.1-9 \| solaris2.1-9.* \| hpux* \| freebsd*)
9		9
10	$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h	10	$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
11		11
12	@@ -23751,7 +23751,7 @@ $as_echo "$ac_res" >&6; }	12	@@ -24468,7 +24468,7 @@ $as_echo "$ac_res" >&6; }
13	if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \	13	if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
14	\|\| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \	14	\|\| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
15	&& test "$PACKAGE" != gettext-runtime \	15	&& test "$PACKAGE" != gettext-runtime \

Lines 1-81 Link Here

(-)devel/gettext-tools/files/patch-git_2336451ed68d91ff (-81 lines)
1	From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001
2	From: Bruno Haible <bruno@clisp.org>
3	Date: Sun, 19 May 2019 13:10:06 +0200
4	Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
5	translations.
6
7	Reported by Don Lawrence <dlawrence@iecok.com>
8	in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html>
9	via Daiki Ueno
10	in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>.
11
12	* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
13	is true.
14	* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
15	---
16	gettext-tools/src/msgmerge.c \| 4 ++--
17	gettext-tools/tests/msgmerge-26 \| 36 +++++++++++++++++++++++++++++++++---
18	2 files changed, 35 insertions(+), 5 deletions(-)
19
20	diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
21	index cd762c0..92c9b7a 100644
22	--- src/msgmerge.c
23	+++ src/msgmerge.c
24	@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
25	else
26	{
27	/* Write the merged message list out. */
28	- msgdomain_list_print (result, output_file, output_syntax, force_po,
29	- false);
30	+ msgdomain_list_print (result, output_file, output_syntax,
31	+ for_msgfmt \|\| force_po, false);
32	}
33
34	exit (EXIT_SUCCESS);
35	diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
36	index cd3862e..b86f7a0 100755
37	--- tests/msgmerge-26
38	+++ tests/msgmerge-26
39	@@ -73,7 +73,37 @@ msgstr "Papaya"
40	EOF
41
42	: ${DIFF=diff}
43	-${DIFF} mm-test26.ok mm-test26.out
44	-result=$?
45	+${DIFF} mm-test26.ok mm-test26.out \|\| Exit 1
46
47	-exit $result
48	+# Test with a PO file that has no translated messages.
49	+
50	+cat <<\EOF > mm-test26a.in1
51	+msgid ""
52	+msgstr ""
53	+"Content-Type: text/plain; charset=UTF-8\n"
54	+
55	+msgid "Hello world"
56	+msgstr "Hallo Welt"
57	+EOF
58	+
59	+cat <<\EOF > mm-test26a.in2
60	+msgid ""
61	+msgstr ""
62	+"Content-Type: text/plain; charset=ASCII\n"
63	+
64	+msgid "Hello, world!"
65	+msgstr ""
66	+EOF
67	+
68	+: ${MSGMERGE=msgmerge}
69	+${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
70	+ \|\| Exit 1
71	+LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out \|\| Exit 1
72	+
73	+cat <<\EOF > mm-test26a.ok
74	+msgid ""
75	+msgstr "Content-Type: text/plain; charset=UTF-8\n"
76	+EOF
77	+
78	+: ${DIFF=diff}
79	+${DIFF} mm-test26a.ok mm-test26a.out \|\| Exit 1
80	--
81	1.9.1