Date: Wed, 1 Jan 2025 16:34:24 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d17e8f667b7 - main - devel/libtextstyle, devel/gettext*: Update to 0.23 Message-ID: <202501011634.501GYOaa060434@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d17e8f667b7b404725f5598a091d9e2cc7c368c commit 5d17e8f667b7b404725f5598a091d9e2cc7c368c Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2024-12-23 13:17:23 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2025-01-01 16:32:31 +0000 devel/libtextstyle, devel/gettext*: Update to 0.23 comms/grig, deskutils/xpad, games/7kaa: Fix problem between autopoint (gettext) and aclocal (automake). First autopoint installs gettext m4 files in WRKSRC/m4 for the version of gettext requested in configure.ac. And then aclocal should use those files. These ports were either missing an "-I m4" flag so aclocal didn't see the autopoint m4 files but used the ones from LOCALBASE/share/aclocal, which are the wrong version, or they used the --install flag that makes aclocal copy files from LOCALBASE/share/aclocal overwriting the autopoint m4 files. PR: 283536 Exp-run by: antoine --- comms/grig/files/patch-Makefile.am | 9 +++++++++ deskutils/xpad/files/patch-Makefile.am | 11 +++++++++++ devel/gettext-runtime/Makefile | 4 +++- devel/gettext-runtime/files/patch-intl_osdep.c | 24 ++++++++++++++++-------- devel/gettext-runtime/pkg-plist | 3 +-- devel/gettext-tools/Makefile | 4 +++- devel/gettext-tools/pkg-plist | 25 +++++++++++++++++-------- devel/gettext/Makefile.common | 2 +- devel/gettext/distinfo | 6 +++--- devel/libtextstyle/pkg-plist | 2 +- games/7kaa/files/patch-Makefile.am | 8 ++++++++ 11 files changed, 73 insertions(+), 25 deletions(-) diff --git a/comms/grig/files/patch-Makefile.am b/comms/grig/files/patch-Makefile.am new file mode 100644 index 000000000000..91a0a577982e --- /dev/null +++ b/comms/grig/files/patch-Makefile.am @@ -0,0 +1,9 @@ +--- Makefile.am.orig 2023-01-24 21:13:11 UTC ++++ Makefile.am +@@ -8,5 +8,4 @@ EXTRA_DIST = \ + win32/Makefile \ + win32/icons/grig.ico + +-# Install any third party macros into our tree for distribution +-ACLOCAL_AMFLAGS = -I m4 --install ++ACLOCAL_AMFLAGS = -I m4 diff --git a/deskutils/xpad/files/patch-Makefile.am b/deskutils/xpad/files/patch-Makefile.am new file mode 100644 index 000000000000..e2fd49b656e5 --- /dev/null +++ b/deskutils/xpad/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2022-05-23 12:07:02 UTC ++++ Makefile.am +@@ -6,7 +6,7 @@ SUBDIRS = \ + po \ + src + +-# ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = -I m4 + + EXTRA_DIST = \ + autogen.sh diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile index 39cfad9b9617..c3d9176d8d06 100644 --- a/devel/gettext-runtime/Makefile +++ b/devel/gettext-runtime/Makefile @@ -22,7 +22,6 @@ CPE_PRODUCT= gettext CPE_VENDOR= gnu GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-gettext \ ac_cv_lib_rt_sched_yield=no INSTALL_TARGET= install-strip @@ -41,4 +40,7 @@ OPTIONS_DEFINE= DOCS CONFIGURE_ARGS+=--disable-threads .endif +post-install: + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/gettext + .include <bsd.port.mk> diff --git a/devel/gettext-runtime/files/patch-intl_osdep.c b/devel/gettext-runtime/files/patch-intl_osdep.c index 1f1825303b65..d6703fb1ca87 100644 --- a/devel/gettext-runtime/files/patch-intl_osdep.c +++ b/devel/gettext-runtime/files/patch-intl_osdep.c @@ -1,26 +1,34 @@ --- intl/osdep.c.orig 2019-05-11 11:29:32 UTC +++ intl/osdep.c -@@ -18,6 +18,25 @@ +@@ -18,6 +18,33 @@ # include "intl-exports.c" #elif defined __EMX__ && !defined __KLIBC__ # include "os2compat.c" +#elif defined __FreeBSD__ +#include <config.h> -+#include <sys/param.h> ++#include <osreldate.h> +#include <dlfcn.h> +#include <pthread.h> +static __attribute__((constructor)) void +libintl_init (void) +{ +#if __FreeBSD_version >= 1400094 -+ /* We don't link with libpthread in order to avoid the overhead for -+ non-threaded programs. Instead we dlopen it with RTLD_NOLOAD here -+ to ensure it is initialised when present. */ ++ /* This dlopen call initialises libpthread if it is present. Normally ++ this is handled by linking to libpthread but libintl does not link ++ with libpthread to avoid the overhead for non-threaded programs. */ + (void) dlopen ("libpthread.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD); +#else -+ /* For older versions this hack also triggers libpthread -+ initialisation. */ -+ (void) pthread_self (); ++ /* The dlopen call above does not work correctly on older versions of ++ FreeBSD. Call pthread_mutex_timedlock instead. It initialises ++ libpthread and there's no libc stub that can preempt it. */ ++#pragma weak pthread_mutex_timedlock ++ if (pthread_mutex_timedlock != NULL) ++ { ++ pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; ++ pthread_mutex_timedlock (&lock, NULL); ++ pthread_mutex_unlock (&lock); ++ pthread_mutex_destroy (&lock); ++ } +#endif +} #else diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist index ddb7d946bc6c..0854fd8b707c 100644 --- a/devel/gettext-runtime/pkg-plist +++ b/devel/gettext-runtime/pkg-plist @@ -11,7 +11,7 @@ lib/libasprintf.so.0.0.0 lib/libintl.a lib/libintl.so lib/libintl.so.8 -lib/libintl.so.8.4.0 +lib/libintl.so.8.4.1 %%PORTDOCS%%%%DOCSDIR%%/bind_textdomain_codeset.3.html %%PORTDOCS%%%%DOCSDIR%%/bindtextdomain.3.html %%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.html @@ -66,7 +66,6 @@ share/locale/it/LC_MESSAGES/gettext-runtime.mo share/locale/ja/LC_MESSAGES/gettext-runtime.mo share/locale/ka/LC_MESSAGES/gettext-runtime.mo share/locale/ko/LC_MESSAGES/gettext-runtime.mo -share/locale/locale.alias share/locale/nb/LC_MESSAGES/gettext-runtime.mo share/locale/nl/LC_MESSAGES/gettext-runtime.mo share/locale/nn/LC_MESSAGES/gettext-runtime.mo diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index 23d730be60e3..f49004bd43e8 100644 --- a/devel/gettext-tools/Makefile +++ b/devel/gettext-tools/Makefile @@ -23,7 +23,6 @@ CPE_PRODUCT= gettext CPE_VENDOR= gnu GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-glib \ --with-included-libcroco --with-included-libunistring \ --with-included-libxml --with-installed-libtextstyle \ @@ -54,4 +53,7 @@ post-patch: @${ECHO_CMD} $$'# Generated by libtool\nlibrary_names=libasprintf.so\nlibdir=${LOCALBASE}/lib' \ > ${WRKSRC}/../gettext-runtime/libasprintf/libasprintf.la +post-install: + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/gettext + .include <bsd.port.mk> diff --git a/devel/gettext-tools/pkg-plist b/devel/gettext-tools/pkg-plist index d784fb82ffde..c761319de349 100644 --- a/devel/gettext-tools/pkg-plist +++ b/devel/gettext-tools/pkg-plist @@ -17,21 +17,21 @@ bin/msguniq bin/recode-sr-latin bin/xgettext include/gettext-po.h -lib/gettext/cldr-plurals -lib/gettext/hostname -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/libgettextpo.so.0.5.11 lib/libgettextsrc-%%PORTVERSION%%.so lib/libgettextsrc.a lib/libgettextsrc.so +libexec/gettext/cldr-plurals +libexec/gettext/hostname +libexec/gettext/project-id +libexec/gettext/urlget +libexec/gettext/user-email share/aclocal/build-to-host.m4 share/aclocal/gettext.m4 share/aclocal/host-cpu-c-abi.m4 @@ -1820,6 +1820,9 @@ share/aclocal/progtest.m4 %%PORTDOCS%%%%DOCSDIR%%/recode-sr-latin.1.html %%PORTDOCS%%%%DOCSDIR%%/tutorial.html %%PORTDOCS%%%%DOCSDIR%%/xgettext.1.html +%%DATADIR%%-%%VERSION%%/its/docbook.loc +%%DATADIR%%-%%VERSION%%/its/docbook4.its +%%DATADIR%%-%%VERSION%%/its/docbook5.its %%DATADIR%%-%%VERSION%%/its/glade.loc %%DATADIR%%-%%VERSION%%/its/glade1.its %%DATADIR%%-%%VERSION%%/its/glade2.its @@ -1830,6 +1833,7 @@ share/aclocal/progtest.m4 %%DATADIR%%-%%VERSION%%/its/metainfo.loc %%DATADIR%%/archive.dir.tar.xz %%DATADIR%%/config.rpath +%%DATADIR%%/disclaim-translations.txt %%DATADIR%%/javaversion.class %%DATADIR%%/msgunfmt.tcl %%DATADIR%%/po/Makefile.in.in @@ -1838,9 +1842,9 @@ share/aclocal/progtest.m4 %%DATADIR%%/po/boldquot.sed %%DATADIR%%/po/en@boldquot.header %%DATADIR%%/po/en@quot.header -%%DATADIR%%/po/insert-header.sin +%%DATADIR%%/po/insert-header.sed %%DATADIR%%/po/quot.sed -%%DATADIR%%/po/remove-potcdate.sin +%%DATADIR%%/po/remove-potcdate.sed %%DATADIR%%/projects/GNOME/team-address %%DATADIR%%/projects/GNOME/teams.html %%DATADIR%%/projects/GNOME/teams.url @@ -1855,6 +1859,11 @@ share/aclocal/progtest.m4 %%DATADIR%%/projects/TP/trigger %%DATADIR%%/projects/index %%DATADIR%%/projects/team-address +%%DATADIR%%/schema/its-extensions.xsd +%%DATADIR%%/schema/its.xsd10 +%%DATADIR%%/schema/its.xsd11 +%%DATADIR%%/schema/locating-rules.xsd10 +%%DATADIR%%/schema/locating-rules.xsd11 %%DATADIR%%/styles/po-default.css %%DATADIR%%/styles/po-emacs-x.css %%DATADIR%%/styles/po-emacs-xterm.css diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common index 695e8eb1ecbc..eff2d474dd7c 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.5 +DISTVERSION= 0.23 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 0208553644d8..1b64eb10d9f6 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710233470 -SHA256 (gettext-0.22.5.tar.xz) = fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640 -SIZE (gettext-0.22.5.tar.xz) = 10270724 +TIMESTAMP = 1734954951 +SHA256 (gettext-0.23.tar.xz) = bf31a9b6bdf3e364669c7bd9858f97e4a0c408a8d22940c5d4ab638b65460f85 +SIZE (gettext-0.23.tar.xz) = 11053572 diff --git a/devel/libtextstyle/pkg-plist b/devel/libtextstyle/pkg-plist index 86d20b048a3c..548f2a03fa61 100644 --- a/devel/libtextstyle/pkg-plist +++ b/devel/libtextstyle/pkg-plist @@ -5,7 +5,7 @@ include/textstyle/woe32dll.h lib/libtextstyle.a lib/libtextstyle.so lib/libtextstyle.so.0 -lib/libtextstyle.so.0.2.1 +lib/libtextstyle.so.0.2.2 %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html diff --git a/games/7kaa/files/patch-Makefile.am b/games/7kaa/files/patch-Makefile.am new file mode 100644 index 000000000000..5458559daa66 --- /dev/null +++ b/games/7kaa/files/patch-Makefile.am @@ -0,0 +1,8 @@ +--- Makefile.am.orig 2023-09-22 01:27:50 UTC ++++ Makefile.am +@@ -1,4 +1,4 @@ +-ACLOCAL_AMFLAGS = --install -I m4 ++ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = data include src po +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501011634.501GYOaa060434>