Attachment 249199 Details for Bug 277725 – patch

[patch] patch

gettext.patch (text/plain), 9.44 KB, created by Tijl Coosemans on 2024-03-15 19:42:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2024-03-15 19:42:17 UTC

Size: 9.44 KB

patch

obsolete

>diff --git a/Templates/config.site b/Templates/config.site
>index 9bda8780bf39..ea136fbbe727 100644
>--- a/Templates/config.site
>+++ b/Templates/config.site
>@@ -862,7 +862,7 @@
> : ${gl_cv_func_btowc_eof=yes}
> : ${gl_cv_func_btowc_nul=yes}
> : ${gl_cv_func_fcntl_f_dupfd_cloexec=yes}
>-: ${gl_cv_func_fnmatch_posix=yes}
>+: ${gl_cv_func_fnmatch_posix=no}
> : ${gl_cv_func_fopen_slash=yes}
> : ${gl_cv_func_frexp_no_libm=yes}
> : ${gl_cv_func_fseeko=yes}
>diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile
>index e29cf796dff2..39cfad9b9617 100644
>--- a/devel/gettext-runtime/Makefile
>+++ b/devel/gettext-runtime/Makefile
>@@ -3,7 +3,7 @@
> # discretion.
> 
> PORTNAME=	gettext-runtime
>-PORTREVISION=	1
>+PORTREVISION=	0
> 
> COMMENT=	GNU gettext runtime libraries and programs
> WWW=		https://www.gnu.org/software/gettext/
>diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist
>index 06edfcb7eab4..ddb7d946bc6c 100644
>--- a/devel/gettext-runtime/pkg-plist
>+++ b/devel/gettext-runtime/pkg-plist
>@@ -12,18 +12,6 @@ lib/libintl.a
> lib/libintl.so
> lib/libintl.so.8
> lib/libintl.so.8.4.0
>-share/man/man1/envsubst.1.gz
>-share/man/man1/gettext.1.gz
>-share/man/man1/ngettext.1.gz
>-share/man/man3/bind_textdomain_codeset.3.gz
>-share/man/man3/bindtextdomain.3.gz
>-share/man/man3/dcgettext.3.gz
>-share/man/man3/dcngettext.3.gz
>-share/man/man3/dgettext.3.gz
>-share/man/man3/dngettext.3.gz
>-share/man/man3/gettext.3.gz
>-share/man/man3/ngettext.3.gz
>-share/man/man3/textdomain.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/bind_textdomain_codeset.3.html
> %%PORTDOCS%%%%DOCSDIR%%/bindtextdomain.3.html
> %%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.html
>@@ -97,3 +85,15 @@ share/locale/vi/LC_MESSAGES/gettext-runtime.mo
> share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
> share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
> share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
>+share/man/man1/envsubst.1.gz
>+share/man/man1/gettext.1.gz
>+share/man/man1/ngettext.1.gz
>+share/man/man3/bind_textdomain_codeset.3.gz
>+share/man/man3/bindtextdomain.3.gz
>+share/man/man3/dcgettext.3.gz
>+share/man/man3/dcngettext.3.gz
>+share/man/man3/dgettext.3.gz
>+share/man/man3/dngettext.3.gz
>+share/man/man3/gettext.3.gz
>+share/man/man3/ngettext.3.gz
>+share/man/man3/textdomain.3.gz
>diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
>index baba4b1bbc15..23d730be60e3 100644
>--- a/devel/gettext-tools/Makefile
>+++ b/devel/gettext-tools/Makefile
>@@ -3,7 +3,7 @@
> # discretion.
> 
> PORTNAME=	gettext-tools
>-PORTREVISION=	1
>+PORTREVISION=	0
> 
> COMMENT=	GNU gettext development and translation tools
> WWW=		https://www.gnu.org/software/gettext/
>@@ -45,4 +45,13 @@ OPTIONS_EXCLUDE_DragonFly=	THREADS
> 
> THREADS_CONFIGURE_ENABLE=	threads
> 
>+post-patch:
>+# Point some files to the installed gettext-runtime.
>+	@${LN} -s ${LOCALBASE}/include/libintl.h \
>+		${WRKSRC}/../gettext-runtime/intl/libgnuintl.h
>+	@${ECHO_CMD} $$'# Generated by libtool\nlibrary_names=libintl.so\nlibdir=${LOCALBASE}/lib' \
>+		> ${WRKSRC}/../gettext-runtime/intl/libintl.la
>+	@${ECHO_CMD} $$'# Generated by libtool\nlibrary_names=libasprintf.so\nlibdir=${LOCALBASE}/lib' \
>+		> ${WRKSRC}/../gettext-runtime/libasprintf/libasprintf.la
>+
> .include <bsd.port.mk>
>diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure
>deleted file mode 100644
>index 5ce0fd335b60..000000000000
>--- a/devel/gettext-tools/files/patch-configure
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- configure.orig	2023-06-17 11:54:38 UTC
>-+++ configure
>-@@ -26130,7 +26130,6 @@ printf "%s\n" "$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 \
>--                && test "$PACKAGE" != gettext-tools \
>-                 && test "$PACKAGE" != libintl; }; then
>-           gt_use_preinstalled_gnugettext=yes
>-         else
>diff --git a/devel/gettext-tools/files/patch-src_Makefile.in b/devel/gettext-tools/files/patch-src_Makefile.in
>deleted file mode 100644
>index 6ac2f71193b4..000000000000
>--- a/devel/gettext-tools/files/patch-src_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/Makefile.in.orig	2023-06-17 11:54:44 UTC
>-+++ src/Makefile.in
>-@@ -696,7 +696,7 @@ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
>- msggrep_OBJECTS = $(am_msggrep_OBJECTS)
>- am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
>- 	msginit-lang-table.$(OBJEXT) msginit-plural-count.$(OBJEXT) \
>--	../../gettext-runtime/intl/msginit-localealias.$(OBJEXT)
>-+
>- msginit_OBJECTS = $(am_msginit_OBJECTS)
>- msginit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
>- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
>diff --git a/devel/gettext-tools/files/patch-tests_Makefile.in b/devel/gettext-tools/files/patch-tests_Makefile.in
>deleted file mode 100644
>index 11bd831120cf..000000000000
>--- a/devel/gettext-tools/files/patch-tests_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- tests/Makefile.in.orig	2023-06-25 16:45:40 UTC
>-+++ tests/Makefile.in
>-@@ -3788,7 +3788,7 @@ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTL
>- # but libtool doesn't put -Wl,-framework options into .la files.
>- LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
>- LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
>--LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
>-+LDADD_no = @LTLIBTHREAD@ @LTLIBINTL@
>- tstgettext_SOURCES = \
>-   tstgettext.c ../../gettext-runtime/src/escapes.h \
>-   setlocale.c
>diff --git a/devel/gettext-tools/files/patch-tests_lang-c++ b/devel/gettext-tools/files/patch-tests_lang-c++
>deleted file mode 100644
>index 887a24e088f8..000000000000
>--- a/devel/gettext-tools/files/patch-tests_lang-c++
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- tests/lang-c++.orig	2023-06-08 12:56:56 UTC
>-+++ tests/lang-c++
>-@@ -72,7 +72,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=
>- : ${CONFIG_SHELL=${SHELL-/bin/sh}}
>- ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
>-   ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
>--         ../../../gettext-runtime/libasprintf/libasprintf.la \
>-+         -lasprintf \
>-          ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
>-   || Exit 1
>- 
>diff --git a/devel/gettext-tools/pkg-plist b/devel/gettext-tools/pkg-plist
>index bc42809f924e..d784fb82ffde 100644
>--- a/devel/gettext-tools/pkg-plist
>+++ b/devel/gettext-tools/pkg-plist
>@@ -23,31 +23,15 @@ lib/gettext/project-id
> lib/gettext/urlget
> lib/gettext/user-email
> lib/libgettextlib-%%PORTVERSION%%.so
>+lib/libgettextlib.a
> lib/libgettextlib.so
> lib/libgettextpo.a
> lib/libgettextpo.so
> lib/libgettextpo.so.0
> lib/libgettextpo.so.0.5.10
> lib/libgettextsrc-%%PORTVERSION%%.so
>+lib/libgettextsrc.a
> lib/libgettextsrc.so
>-share/man/man1/autopoint.1.gz
>-share/man/man1/gettextize.1.gz
>-share/man/man1/msgattrib.1.gz
>-share/man/man1/msgcat.1.gz
>-share/man/man1/msgcmp.1.gz
>-share/man/man1/msgcomm.1.gz
>-share/man/man1/msgconv.1.gz
>-share/man/man1/msgen.1.gz
>-share/man/man1/msgexec.1.gz
>-share/man/man1/msgfilter.1.gz
>-share/man/man1/msgfmt.1.gz
>-share/man/man1/msggrep.1.gz
>-share/man/man1/msginit.1.gz
>-share/man/man1/msgmerge.1.gz
>-share/man/man1/msgunfmt.1.gz
>-share/man/man1/msguniq.1.gz
>-share/man/man1/recode-sr-latin.1.gz
>-share/man/man1/xgettext.1.gz
> share/aclocal/build-to-host.m4
> share/aclocal/gettext.m4
> share/aclocal/host-cpu-c-abi.m4
>@@ -1896,6 +1880,7 @@ share/locale/hr/LC_MESSAGES/gettext-tools.mo
> share/locale/id/LC_MESSAGES/gettext-tools.mo
> share/locale/it/LC_MESSAGES/gettext-tools.mo
> share/locale/ja/LC_MESSAGES/gettext-tools.mo
>+share/locale/ka/LC_MESSAGES/gettext-tools.mo
> share/locale/ko/LC_MESSAGES/gettext-tools.mo
> share/locale/nb/LC_MESSAGES/gettext-tools.mo
> share/locale/nl/LC_MESSAGES/gettext-tools.mo
>@@ -1915,3 +1900,21 @@ share/locale/uk/LC_MESSAGES/gettext-tools.mo
> share/locale/vi/LC_MESSAGES/gettext-tools.mo
> share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
> share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
>+share/man/man1/autopoint.1.gz
>+share/man/man1/gettextize.1.gz
>+share/man/man1/msgattrib.1.gz
>+share/man/man1/msgcat.1.gz
>+share/man/man1/msgcmp.1.gz
>+share/man/man1/msgcomm.1.gz
>+share/man/man1/msgconv.1.gz
>+share/man/man1/msgen.1.gz
>+share/man/man1/msgexec.1.gz
>+share/man/man1/msgfilter.1.gz
>+share/man/man1/msgfmt.1.gz
>+share/man/man1/msggrep.1.gz
>+share/man/man1/msginit.1.gz
>+share/man/man1/msgmerge.1.gz
>+share/man/man1/msgunfmt.1.gz
>+share/man/man1/msguniq.1.gz
>+share/man/man1/recode-sr-latin.1.gz
>+share/man/man1/xgettext.1.gz
>diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
>index 332659479429..9c2c561b1dd1 100644
>--- a/devel/gettext/Makefile.common
>+++ b/devel/gettext/Makefile.common
>@@ -2,7 +2,7 @@
> # experimental ports run.  Untested commits may be backed out at portmgr's
> # discretion.
> 
>-DISTVERSION=	0.22.3
>+DISTVERSION=	0.22.5
> PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
> CATEGORIES=	devel
> MASTER_SITES=	GNU/gettext
>diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
>index d355026be1c1..0208553644d8 100644
>--- a/devel/gettext/distinfo
>+++ b/devel/gettext/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1696592259
>-SHA256 (gettext-0.22.3.tar.xz) = b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6
>-SIZE (gettext-0.22.3.tar.xz) = 10236340
>+TIMESTAMP = 1710233470
>+SHA256 (gettext-0.22.5.tar.xz) = fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640
>+SIZE (gettext-0.22.5.tar.xz) = 10270724

Actions: View | Diff

Attachments on bug 277725: 249199