sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/libtextstyle, devel/gettext*: Update to 0.23

Browse source 
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
This commit is contained in:
Tijl Coosemans 2024-12-23 14:17:23 +01:00
parent 8777dde246
commit 5d17e8f667
11 changed files with 73 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
comms/grig/files/patch-Makefile.am Normal file
View file

@ -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

11
deskutils/xpad/files/patch-Makefile.am Normal file
View file

@ -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

4
devel/gettext-runtime/Makefile
View file

@ -22,7 +22,6 @@ CPE_PRODUCT= gettext
CPE_VENDOR= gnu CPE_VENDOR= gnu
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-gettext \ CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-gettext \
ac_cv_lib_rt_sched_yield=no ac_cv_lib_rt_sched_yield=no
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip
@ -41,4 +40,7 @@ OPTIONS_DEFINE= DOCS
CONFIGURE_ARGS+=--disable-threads CONFIGURE_ARGS+=--disable-threads
.endif .endif
post-install:
${RMDIR} ${STAGEDIR}${PREFIX}/lib/gettext
.include <bsd.port.mk> .include <bsd.port.mk>

24
devel/gettext-runtime/files/patch-intl_osdep.c
View file

@ -1,26 +1,34 @@
--- intl/osdep.c.orig 2019-05-11 11:29:32 UTC --- intl/osdep.c.orig 2019-05-11 11:29:32 UTC
+++ intl/osdep.c +++ intl/osdep.c
@@ -18,6 +18,25 @@ @@ -18,6 +18,33 @@
# include "intl-exports.c" # include "intl-exports.c"
#elif defined __EMX__ && !defined __KLIBC__ #elif defined __EMX__ && !defined __KLIBC__
# include "os2compat.c" # include "os2compat.c"
+#elif defined __FreeBSD__ +#elif defined __FreeBSD__
+#include <config.h> +#include <config.h>
+#include <sys/param.h> +#include <osreldate.h>
+#include <dlfcn.h> +#include <dlfcn.h>
+#include <pthread.h> +#include <pthread.h>
+static __attribute__((constructor)) void +static __attribute__((constructor)) void
+libintl_init (void) +libintl_init (void)
+{ +{
+#if __FreeBSD_version >= 1400094 +#if __FreeBSD_version >= 1400094
+ /* We don't link with libpthread in order to avoid the overhead for + /* This dlopen call initialises libpthread if it is present. Normally
+ non-threaded programs. Instead we dlopen it with RTLD_NOLOAD here + this is handled by linking to libpthread but libintl does not link
+ to ensure it is initialised when present. */ + with libpthread to avoid the overhead for non-threaded programs. */
+ (void) dlopen ("libpthread.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD); + (void) dlopen ("libpthread.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD);
+#else +#else
+ /* For older versions this hack also triggers libpthread + /* The dlopen call above does not work correctly on older versions of
+ initialisation. */ + FreeBSD. Call pthread_mutex_timedlock instead. It initialises
+ (void) pthread_self (); + 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 +#endif
+} +}
#else #else

3
devel/gettext-runtime/pkg-plist
View file

@ -11,7 +11,7 @@ lib/libasprintf.so.0.0.0
lib/libintl.a lib/libintl.a
lib/libintl.so lib/libintl.so
lib/libintl.so.8 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%%/bind_textdomain_codeset.3.html
%%PORTDOCS%%%%DOCSDIR%%/bindtextdomain.3.html %%PORTDOCS%%%%DOCSDIR%%/bindtextdomain.3.html
%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.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/ja/LC_MESSAGES/gettext-runtime.mo
share/locale/ka/LC_MESSAGES/gettext-runtime.mo share/locale/ka/LC_MESSAGES/gettext-runtime.mo
share/locale/ko/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/nb/LC_MESSAGES/gettext-runtime.mo
share/locale/nl/LC_MESSAGES/gettext-runtime.mo share/locale/nl/LC_MESSAGES/gettext-runtime.mo
share/locale/nn/LC_MESSAGES/gettext-runtime.mo share/locale/nn/LC_MESSAGES/gettext-runtime.mo

4
devel/gettext-tools/Makefile
View file

@ -23,7 +23,6 @@ CPE_PRODUCT= gettext
CPE_VENDOR= gnu CPE_VENDOR= gnu
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-glib \ CONFIGURE_ARGS= --disable-csharp --disable-java --with-included-glib \
--with-included-libcroco --with-included-libunistring \ --with-included-libcroco --with-included-libunistring \
--with-included-libxml --with-installed-libtextstyle \ --with-included-libxml --with-installed-libtextstyle \
@ -54,4 +53,7 @@ post-patch:
@${ECHO_CMD} $$'# Generated by libtool\nlibrary_names=libasprintf.so\nlibdir=${LOCALBASE}/lib' \ @${ECHO_CMD} $$'# Generated by libtool\nlibrary_names=libasprintf.so\nlibdir=${LOCALBASE}/lib' \
> ${WRKSRC}/../gettext-runtime/libasprintf/libasprintf.la > ${WRKSRC}/../gettext-runtime/libasprintf/libasprintf.la
post-install:
${RMDIR} ${STAGEDIR}${PREFIX}/lib/gettext
.include <bsd.port.mk> .include <bsd.port.mk>

25
devel/gettext-tools/pkg-plist
View file

@ -17,21 +17,21 @@ bin/msguniq
bin/recode-sr-latin bin/recode-sr-latin
bin/xgettext bin/xgettext
include/gettext-po.h 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-%%PORTVERSION%%.so
lib/libgettextlib.a lib/libgettextlib.a
lib/libgettextlib.so lib/libgettextlib.so
lib/libgettextpo.a lib/libgettextpo.a
lib/libgettextpo.so lib/libgettextpo.so
lib/libgettextpo.so.0 lib/libgettextpo.so.0
lib/libgettextpo.so.0.5.10 lib/libgettextpo.so.0.5.11
lib/libgettextsrc-%%PORTVERSION%%.so lib/libgettextsrc-%%PORTVERSION%%.so
lib/libgettextsrc.a lib/libgettextsrc.a
lib/libgettextsrc.so 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/build-to-host.m4
share/aclocal/gettext.m4 share/aclocal/gettext.m4
share/aclocal/host-cpu-c-abi.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%%/recode-sr-latin.1.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial.html %%PORTDOCS%%%%DOCSDIR%%/tutorial.html
%%PORTDOCS%%%%DOCSDIR%%/xgettext.1.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/glade.loc
%%DATADIR%%-%%VERSION%%/its/glade1.its %%DATADIR%%-%%VERSION%%/its/glade1.its
%%DATADIR%%-%%VERSION%%/its/glade2.its %%DATADIR%%-%%VERSION%%/its/glade2.its
@ -1830,6 +1833,7 @@ share/aclocal/progtest.m4
%%DATADIR%%-%%VERSION%%/its/metainfo.loc %%DATADIR%%-%%VERSION%%/its/metainfo.loc
%%DATADIR%%/archive.dir.tar.xz %%DATADIR%%/archive.dir.tar.xz
%%DATADIR%%/config.rpath %%DATADIR%%/config.rpath
%%DATADIR%%/disclaim-translations.txt
%%DATADIR%%/javaversion.class %%DATADIR%%/javaversion.class
%%DATADIR%%/msgunfmt.tcl %%DATADIR%%/msgunfmt.tcl
%%DATADIR%%/po/Makefile.in.in %%DATADIR%%/po/Makefile.in.in
@ -1838,9 +1842,9 @@ share/aclocal/progtest.m4
%%DATADIR%%/po/boldquot.sed %%DATADIR%%/po/boldquot.sed
%%DATADIR%%/po/en@boldquot.header %%DATADIR%%/po/en@boldquot.header
%%DATADIR%%/po/en@quot.header %%DATADIR%%/po/en@quot.header
%%DATADIR%%/po/insert-header.sin %%DATADIR%%/po/insert-header.sed
%%DATADIR%%/po/quot.sed %%DATADIR%%/po/quot.sed
%%DATADIR%%/po/remove-potcdate.sin %%DATADIR%%/po/remove-potcdate.sed
%%DATADIR%%/projects/GNOME/team-address %%DATADIR%%/projects/GNOME/team-address
%%DATADIR%%/projects/GNOME/teams.html %%DATADIR%%/projects/GNOME/teams.html
%%DATADIR%%/projects/GNOME/teams.url %%DATADIR%%/projects/GNOME/teams.url
@ -1855,6 +1859,11 @@ share/aclocal/progtest.m4
%%DATADIR%%/projects/TP/trigger %%DATADIR%%/projects/TP/trigger
%%DATADIR%%/projects/index %%DATADIR%%/projects/index
%%DATADIR%%/projects/team-address %%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-default.css
%%DATADIR%%/styles/po-emacs-x.css %%DATADIR%%/styles/po-emacs-x.css
%%DATADIR%%/styles/po-emacs-xterm.css %%DATADIR%%/styles/po-emacs-xterm.css

2
devel/gettext/Makefile.common
View file

@ -2,7 +2,7 @@
# experimental ports run. Untested commits may be backed out at portmgr's # experimental ports run. Untested commits may be backed out at portmgr's
# discretion. # discretion.
DISTVERSION= 0.22.5 DISTVERSION= 0.23
PORTREVISION?= 0 # Leave this zero. Set in Makefile instead. PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= GNU/gettext MASTER_SITES= GNU/gettext

6
devel/gettext/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1710233470 TIMESTAMP = 1734954951
SHA256 (gettext-0.22.5.tar.xz) = fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640 SHA256 (gettext-0.23.tar.xz) = bf31a9b6bdf3e364669c7bd9858f97e4a0c408a8d22940c5d4ab638b65460f85
SIZE (gettext-0.22.5.tar.xz) = 10270724 SIZE (gettext-0.23.tar.xz) = 11053572

2
devel/libtextstyle/pkg-plist
View file

@ -5,7 +5,7 @@ include/textstyle/woe32dll.h
lib/libtextstyle.a lib/libtextstyle.a
lib/libtextstyle.so lib/libtextstyle.so
lib/libtextstyle.so.0 lib/libtextstyle.so.0
lib/libtextstyle.so.0.2.1 lib/libtextstyle.so.0.2.2
%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html
%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html
%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html

8
games/7kaa/files/patch-Makefile.am Normal file
View file

@ -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