View | Details | Raw Unified | Return to bug 272210 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/gettext-runtime/files/patch-configure (-4 / +4 lines)
Lines 1-11 Link Here
1
--- configure.orig	2022-10-09 21:31:34 UTC
1
--- configure.orig	2023-06-17 11:53:59 UTC
2
+++ configure
2
+++ configure
3
@@ -22002,7 +22002,7 @@ then :
3
@@ -27079,7 +27079,7 @@ then :
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
 printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
10
 printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
11
 
11
 
(-)b/devel/gettext-runtime/files/patch-intl-threadlib.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- intl/threadlib.c.orig	2013-03-07 08:44:37 UTC
1
--- intl/gnulib-lib/glthread/threadlib.c.orig	2013-03-07 08:44:37 UTC
2
+++ intl/threadlib.c
2
+++ intl/gnulib-lib/glthread/threadlib.c
3
@@ -29,11 +29,10 @@
3
@@ -29,11 +29,10 @@
4
 
4
 
5
 # if PTHREAD_IN_USE_DETECTION_HARD
5
 # if PTHREAD_IN_USE_DETECTION_HARD
(-)b/devel/gettext-runtime/pkg-plist (+1 lines)
Lines 76-81 share/locale/hu/LC_MESSAGES/gettext-runtime.mo Link Here
76
share/locale/id/LC_MESSAGES/gettext-runtime.mo
76
share/locale/id/LC_MESSAGES/gettext-runtime.mo
77
share/locale/it/LC_MESSAGES/gettext-runtime.mo
77
share/locale/it/LC_MESSAGES/gettext-runtime.mo
78
share/locale/ja/LC_MESSAGES/gettext-runtime.mo
78
share/locale/ja/LC_MESSAGES/gettext-runtime.mo
79
share/locale/ka/LC_MESSAGES/gettext-runtime.mo
79
share/locale/ko/LC_MESSAGES/gettext-runtime.mo
80
share/locale/ko/LC_MESSAGES/gettext-runtime.mo
80
share/locale/locale.alias
81
share/locale/locale.alias
81
share/locale/nb/LC_MESSAGES/gettext-runtime.mo
82
share/locale/nb/LC_MESSAGES/gettext-runtime.mo
(-)b/devel/gettext-tools/Makefile (-17 / +2 lines)
Lines 25-31 CPE_VENDOR= gnu Link Here
25
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
26
CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-glib \
26
CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-glib \
27
		--with-included-libcroco --with-included-libunistring \
27
		--with-included-libcroco --with-included-libunistring \
28
		--with-included-libxml --with-xz --without-emacs \
28
		--with-included-libxml --with-installed-libtextstyle \
29
		--with-xz --without-emacs \
29
		ac_cv_lib_rt_sched_yield=no
30
		ac_cv_lib_rt_sched_yield=no
30
INSTALL_TARGET=	install-strip
31
INSTALL_TARGET=	install-strip
31
TEST_TARGET=	check
32
TEST_TARGET=	check
Lines 43-62 OPTIONS_EXCLUDE_DragonFly= THREADS Link Here
43
44
44
THREADS_CONFIGURE_ENABLE=	threads
45
THREADS_CONFIGURE_ENABLE=	threads
45
46
46
post-patch:
47
# Do not patch system float.h.
48
	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
49
		${WRKSRC}/configure
50
# Use libintl installed by gettext-runtime.
51
	@${REINPLACE_CMD} '/^LDADD_no =/s,\.\./intl/libgnuintl.la,,' \
52
		${WRKSRC}/tests/Makefile.in
53
# Use libasprintf installed by gettext-runtime.
54
	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
55
		${WRKSRC}/tests/lang-c++
56
# Use system libtextstyle.
57
	@${REINPLACE_CMD} \
58
		-e '/:/!s,[[:<:]]textstyle[^[:space:]]*\.h,,g' \
59
		-e 's,\.\./\.\./libtextstyle/lib/libtextstyle\.la,-ltextstyle,' \
60
		${WRKSRC}/src/Makefile.in
61
62
.include <bsd.port.mk>
47
.include <bsd.port.mk>
(-)b/devel/gettext-tools/files/patch-configure (-13 / +28 lines)
Lines 1-20 Link Here
1
--- configure.orig	2022-10-09 21:32:05 UTC
1
--- configure.orig	2023-06-17 11:54:38 UTC
2
+++ configure
2
+++ configure
3
@@ -24756,7 +24756,7 @@ then :
3
@@ -26130,7 +26130,6 @@ printf "%s\n" "$ac_res" >&6; }
4
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
5
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
6
                 && test "$PACKAGE" != gettext-runtime \
7
-                && test "$PACKAGE" != gettext-tools \
8
                 && test "$PACKAGE" != libintl; }; then
9
           gt_use_preinstalled_gnugettext=yes
10
         else
11
@@ -35320,7 +35319,7 @@ then :
4
              # On Solaris 10 or newer, this test is no longer needed, because
12
              # On Solaris 10 or newer, this test is no longer needed, because
5
              # libc contains the fully functional pthread functions.
13
              # libc contains the fully functional pthread functions.
6
              case "$host_os" in
14
              case "$host_os" in
7
-               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
15
-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
8
+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
16
+               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
9
 
17
 
10
 printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
18
 printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
11
 
19
 
12
@@ -29661,7 +29661,7 @@ printf "%s\n" "$ac_res" >&6; }
20
@@ -57159,7 +57158,6 @@ printf "%s\n" "$gl_cv_next_float_h" >&6; }
13
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
21
     false) FLOAT_H='' ;;
14
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
22
     true)
15
                 && test "$PACKAGE" != gettext-runtime \
23
                   if test -z "$FLOAT_H"; then
16
-                && test "$PACKAGE" != gettext-tools; }; then
24
-        FLOAT_H="${gl_source_base_prefix}float.h"
17
+                ; }; then
25
       fi
18
           gt_use_preinstalled_gnugettext=yes
26
       ;;
19
         else
27
     *) echo "*** GL_GENERATE_FLOAT_H is not set correctly" 1>&2; exit 1 ;;
20
                     LIBINTL=
28
@@ -89973,7 +89971,6 @@ printf "%s\n" "$gl_cv_next_float_h" >&6; }
29
     false) FLOAT_H='' ;;
30
     true)
31
                   if test -z "$FLOAT_H"; then
32
-        FLOAT_H="${gl_source_base_prefix}float.h"
33
       fi
34
       ;;
35
     *) echo "*** GL_GENERATE_FLOAT_H is not set correctly" 1>&2; exit 1 ;;
(-)b/devel/gettext-tools/files/patch-src_Makefile.in (+11 lines)
Added Link Here
1
--- src/Makefile.in.orig	2023-06-17 11:54:44 UTC
2
+++ src/Makefile.in
3
@@ -696,7 +696,7 @@ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
4
 msggrep_OBJECTS = $(am_msggrep_OBJECTS)
5
 am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
6
 	msginit-lang-table.$(OBJEXT) msginit-plural-count.$(OBJEXT) \
7
-	../../gettext-runtime/intl/msginit-localealias.$(OBJEXT)
8
+
9
 msginit_OBJECTS = $(am_msginit_OBJECTS)
10
 msginit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
11
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
(-)b/devel/gettext-tools/files/patch-tests_Makefile.in (+11 lines)
Added Link Here
1
--- tests/Makefile.in.orig	2023-06-25 16:45:40 UTC
2
+++ tests/Makefile.in
3
@@ -3788,7 +3788,7 @@ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTL
4
 # but libtool doesn't put -Wl,-framework options into .la files.
5
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
6
 LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
7
-LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
8
+LDADD_no = @LTLIBTHREAD@ @LTLIBINTL@
9
 tstgettext_SOURCES = \
10
   tstgettext.c ../../gettext-runtime/src/escapes.h \
11
   setlocale.c
(-)b/devel/gettext-tools/files/patch-tests_lang-c++ (+11 lines)
Added Link Here
1
--- tests/lang-c++.orig	2023-06-08 12:56:56 UTC
2
+++ tests/lang-c++
3
@@ -72,7 +72,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=
4
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
5
 ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
6
   ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
7
-         ../../../gettext-runtime/libasprintf/libasprintf.la \
8
+         -lasprintf \
9
          ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
10
   || Exit 1
11
 
(-)b/devel/gettext-tools/pkg-plist (-1 / +57 lines)
Lines 27-33 lib/libgettextlib.so Link Here
27
lib/libgettextpo.a
27
lib/libgettextpo.a
28
lib/libgettextpo.so
28
lib/libgettextpo.so
29
lib/libgettextpo.so.0
29
lib/libgettextpo.so.0
30
lib/libgettextpo.so.0.5.8
30
lib/libgettextpo.so.0.5.9
31
lib/libgettextsrc-%%PORTVERSION%%.so
31
lib/libgettextsrc-%%PORTVERSION%%.so
32
lib/libgettextsrc.so
32
lib/libgettextsrc.so
33
man/man1/autopoint.1.gz
33
man/man1/autopoint.1.gz
Lines 48-53 man/man1/msgunfmt.1.gz Link Here
48
man/man1/msguniq.1.gz
48
man/man1/msguniq.1.gz
49
man/man1/recode-sr-latin.1.gz
49
man/man1/recode-sr-latin.1.gz
50
man/man1/xgettext.1.gz
50
man/man1/xgettext.1.gz
51
share/aclocal/build-to-host.m4
51
share/aclocal/gettext.m4
52
share/aclocal/gettext.m4
52
share/aclocal/host-cpu-c-abi.m4
53
share/aclocal/host-cpu-c-abi.m4
53
share/aclocal/iconv.m4
54
share/aclocal/iconv.m4
Lines 373-378 share/aclocal/progtest.m4 Link Here
373
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_CN.po
374
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_CN.po
374
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_HK.po
375
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_HK.po
375
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_TW.po
376
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_TW.po
377
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/INSTALL
378
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/Makefile.am
379
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autoclean.sh
380
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autogen.sh
381
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/configure.ac
382
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/hello.cc
383
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/m4/Makefile.am
384
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/LINGUAS
385
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/Makevars
386
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/POTFILES.in
387
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/af.po
388
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ast.po
389
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/bg.po
390
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ca.po
391
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/cs.po
392
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/da.po
393
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/de.po
394
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/el.po
395
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/eo.po
396
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/es.po
397
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fi.po
398
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fr.po
399
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ga.po
400
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/gl.po
401
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hr.po
402
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hu.po
403
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/id.po
404
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/it.po
405
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ja.po
406
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ka.po
407
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ky.po
408
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/lv.po
409
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ms.po
410
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/mt.po
411
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nb.po
412
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nl.po
413
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nn.po
414
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pl.po
415
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt.po
416
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt_BR.po
417
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ro.po
418
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ru.po
419
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sk.po
420
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sl.po
421
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sq.po
422
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sr.po
423
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sv.po
424
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ta.po
425
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/tr.po
426
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/uk.po
427
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/vi.po
428
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_CN.po
429
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_HK.po
430
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_TW.po
376
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/INSTALL
431
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/INSTALL
377
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/Makefile.am
432
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/Makefile.am
378
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/autoclean.sh
433
%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/autoclean.sh
Lines 1837-1842 share/locale/eu/LC_MESSAGES/gettext-tools.mo Link Here
1837
share/locale/fi/LC_MESSAGES/gettext-tools.mo
1892
share/locale/fi/LC_MESSAGES/gettext-tools.mo
1838
share/locale/fr/LC_MESSAGES/gettext-tools.mo
1893
share/locale/fr/LC_MESSAGES/gettext-tools.mo
1839
share/locale/gl/LC_MESSAGES/gettext-tools.mo
1894
share/locale/gl/LC_MESSAGES/gettext-tools.mo
1895
share/locale/hr/LC_MESSAGES/gettext-tools.mo
1840
share/locale/id/LC_MESSAGES/gettext-tools.mo
1896
share/locale/id/LC_MESSAGES/gettext-tools.mo
1841
share/locale/it/LC_MESSAGES/gettext-tools.mo
1897
share/locale/it/LC_MESSAGES/gettext-tools.mo
1842
share/locale/ja/LC_MESSAGES/gettext-tools.mo
1898
share/locale/ja/LC_MESSAGES/gettext-tools.mo
(-)b/devel/gettext/Makefile.common (-1 / +1 lines)
Lines 2-8 Link Here
2
# experimental ports run.  Untested commits may be backed out at portmgr's
2
# experimental ports run.  Untested commits may be backed out at portmgr's
3
# discretion.
3
# discretion.
4
4
5
PORTVERSION=	0.21.1
5
PORTVERSION=	0.22
6
PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
6
PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	GNU/gettext
8
MASTER_SITES=	GNU/gettext
(-)b/devel/gettext/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1669052475
1
TIMESTAMP = 1687532203
2
SHA256 (gettext-0.21.1.tar.xz) = 50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6
2
SHA256 (gettext-0.22.tar.xz) = 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93
3
SIZE (gettext-0.21.1.tar.xz) = 10054564
3
SIZE (gettext-0.22.tar.xz) = 10008808
(-)b/devel/libtextstyle/pkg-plist (-1 / +1 lines)
Lines 5-11 include/textstyle/woe32dll.h Link Here
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.1.2
8
lib/libtextstyle.so.0.2.0
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 272210