SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync ports with The Matrix

Browse source
This commit is contained in:
purplerain 2023-09-14 00:49:35 +00:00
parent 9d4d2e721a
commit 79bc6d9d97
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
846 changed files with 10693 additions and 8131 deletions
Download patch file Download diff file Expand all files Collapse all files

29
devel/gettext/patches/patch-gettext-runtime_intl_Makefile_in Normal file
View file

@ -0,0 +1,29 @@
Provide unprefixed symbols, e.g. libintl_dgettext -> dgettext
https://savannah.gnu.org/bugs/index.php?64323
Fix build failure with "make -j"
https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15
Index: gettext-runtime/intl/Makefile.in
--- gettext-runtime/intl/Makefile.in.orig
+++ gettext-runtime/intl/Makefile.in
@@ -1692,7 +1692,7 @@ SUFFIXES =
AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
-DLOCALEDIR=$(localedir_c_make) \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \
- -DBUILDING_LIBINTL $(am__append_1)
+ -DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1)
# Enable more warning options in this directory.
@@ -2601,8 +2601,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h
ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
plural-exp.lo: ../config.h $(srcdir)/plural-exp.h
-langprefs.lo: ../config.h
-log.lo: ../config.h
+langprefs.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
+log.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
printf.lo: ../config.h
setlocale.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
version.lo: ../config.h libgnuintl.h

15
devel/gettext/patches/patch-gettext-runtime_intl_configure Normal file
View file

@ -0,0 +1,15 @@
There is no use for a relocatable library and this restores the .la file.
https://savannah.gnu.org/bugs/index.php?64536
Index: gettext-runtime/intl/configure
--- gettext-runtime/intl/configure.orig
+++ gettext-runtime/intl/configure
@@ -6695,7 +6695,7 @@ fi
-enable_relocatable=yes
+enable_relocatable=no
ac_header= ac_cache=
for ac_item in $ac_header_c_list

14
devel/gettext/patches/patch-gettext-runtime_intl_dcigettext_c
View file

@ -1,7 +1,7 @@
Index: gettext-runtime/intl/dcigettext.c
--- gettext-runtime/intl/dcigettext.c.orig
+++ gettext-runtime/intl/dcigettext.c
@@ -489,6 +489,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -476,6 +476,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
const char *localename;
#endif
size_t domainname_len;
@ -9,7 +9,7 @@ Index: gettext-runtime/intl/dcigettext.c
/* If no real MSGID is given return NULL. */
if (msgid1 == NULL)
@@ -680,6 +681,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -667,6 +668,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
/* We have a relative path. Make it absolute now. */
size_t dirname_len = strlen (dirname) + 1;
size_t path_max;
@ -17,7 +17,7 @@ Index: gettext-runtime/intl/dcigettext.c
char *resolved_dirname;
char *ret;
@@ -688,7 +690,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -675,7 +677,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
for (;;)
{
@ -27,7 +27,7 @@ Index: gettext-runtime/intl/dcigettext.c
ADD_BLOCK (block_list, resolved_dirname);
__set_errno (0);
@@ -705,7 +708,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -692,7 +695,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1
error but simply return the default string. */
goto return_untranslated;
@ -37,7 +37,7 @@ Index: gettext-runtime/intl/dcigettext.c
dirname = resolved_dirname;
}
#endif
@@ -724,13 +728,14 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -711,13 +715,14 @@ DCIGETTEXT (const char *domainname, const char *msgid1
#endif
domainname_len = strlen (domainname);
@ -57,7 +57,7 @@ Index: gettext-runtime/intl/dcigettext.c
/* Creating working area. */
single_locale = (char *) alloca (strlen (categoryvalue) + 1);
@@ -832,13 +837,17 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -819,13 +824,17 @@ DCIGETTEXT (const char *domainname, const char *msgid1
/* Create a new entry and add it to the search tree. */
size_t msgid_len;
size_t size;
@ -76,7 +76,7 @@ Index: gettext-runtime/intl/dcigettext.c
#endif
newp = (struct known_translation_t *) malloc (size);
if (newp != NULL)
@@ -854,7 +863,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
@@ -841,7 +850,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1
memcpy (new_domainname, domainname, domainname_len + 1);
#ifdef HAVE_PER_THREAD_LOCALE
new_localename = new_domainname + domainname_len + 1;

6
devel/gettext/patches/patch-gettext-runtime_intl_relocatable_c → devel/gettext/patches/patch-gettext-runtime_intl_gnulib-lib_relocatable_c
View file

@ -1,6 +1,6 @@
Index: gettext-runtime/intl/relocatable.c
--- gettext-runtime/intl/relocatable.c.orig
+++ gettext-runtime/intl/relocatable.c
Index: gettext-runtime/intl/gnulib-lib/relocatable.c
--- gettext-runtime/intl/gnulib-lib/relocatable.c.orig
+++ gettext-runtime/intl/gnulib-lib/relocatable.c
@@ -524,13 +524,17 @@ relocate (const char *pathname)
if (pathname[orig_prefix_len] == '\0')
{

2
devel/gettext/patches/patch-gettext-runtime_intl_l10nflist_c
View file

@ -71,7 +71,7 @@ Index: gettext-runtime/intl/l10nflist.c
}
#if defined _WIN32 && !defined __CYGWIN__
@@ -367,7 +370,7 @@ _nl_normalize_codeset (const char *codeset, size_t nam
@@ -384,7 +387,7 @@ _nl_normalize_codeset (const char *codeset, size_t nam
if (retval != NULL)
{
if (only_digit)

9
devel/gettext/patches/patch-gettext-runtime_intl_log_c
View file

@ -1,6 +1,7 @@
--- gettext-runtime/intl/log.c.orig Tue Dec 4 07:28:58 2012
+++ gettext-runtime/intl/log.c Wed Jan 16 23:06:10 2013
@@ -66,6 +66,7 @@ _nl_log_untranslated_locked (const char *logfilename,
Index: gettext-runtime/intl/log.c
--- gettext-runtime/intl/log.c.orig
+++ gettext-runtime/intl/log.c
@@ -69,6 +69,7 @@ _nl_log_untranslated_locked (const char *logfilename,
{
FILE *logfile;
const char *separator;
@ -8,7 +9,7 @@
/* Can we reuse the last opened logfile? */
if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
@@ -82,10 +83,11 @@ _nl_log_untranslated_locked (const char *logfilename,
@@ -85,10 +86,11 @@ _nl_log_untranslated_locked (const char *logfilename,
last_logfilename = NULL;
}
/* Open the logfile. */

16
devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile_in
View file

@ -6,16 +6,16 @@ This was also a race if MAKE_JOBS > 1.
Index: gettext-tools/gnulib-lib/Makefile.in
--- gettext-tools/gnulib-lib/Makefile.in.orig
+++ gettext-tools/gnulib-lib/Makefile.in
@@ -3542,7 +3542,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
$(LIB_HARD_LOCALE) $(LIB_MBRTOWC) $(LIB_POSIX_SPAWN) \
$(LIB_SETLOCALE) $(LIB_SETLOCALE_NULL) $(LOG10_LIBM) \
$(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(POW_LIBM) \
- @INTL_MACOSX_LIBS@ -release @VERSION@ $(am__append_3) \
+ @INTL_MACOSX_LIBS@ $(am__append_3) \
$(am__append_8) $(am__append_25) $(am__append_26)
@@ -4390,7 +4390,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
$(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(MBRTOWC_LIB) \
$(POSIX_SPAWN_LIB) $(POW_LIBM) $(QCOPY_ACL_LIB) $(SERVENT_LIB) \
$(SETLOCALE_LIB) $(SETLOCALE_NULL_LIB) @INTL_MACOSX_LIBS@ \
- -release @VERSION@ $(am__append_36) $(am__append_50) \
+ $(am__append_36) $(am__append_50) \
$(am__append_150) $(am__append_151)
# Use this preprocessor expression to decide whether #include_next works.
@@ -4553,7 +4553,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX
@@ -6539,7 +6539,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX
@GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@
# No need to install libgettextlib.a, except on AIX.

8
devel/gettext/patches/patch-gettext-tools_gnulib-lib_asyncsafe-spin_c
View file

@ -3,12 +3,12 @@
Index: gettext-tools/gnulib-lib/asyncsafe-spin.c
--- gettext-tools/gnulib-lib/asyncsafe-spin.c.orig
+++ gettext-tools/gnulib-lib/asyncsafe-spin.c
@@ -138,7 +138,7 @@ do_unlock (asyncsafe_spinlock_t *lock)
@@ -136,7 +136,7 @@ do_unlock (asyncsafe_spinlock_t *lock)
# elif (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \
&& !defined __sparc__) \
&& !(defined __sun && defined __sparc__) && !defined __ANDROID__) \
|| __clang_major__ >= 3) \
- && !defined __ibmxl__
+ && !defined __ibmxl__ && !defined(__hppa__)
/* Use GCC built-ins (available in GCC >= 4.1, except on SPARC, and
clang >= 3.0).
/* Use GCC built-ins (available in GCC >= 4.1, except on Solaris/SPARC and
Android, and clang >= 3.0).
Documentation:

4
devel/gettext/patches/patch-gettext-tools_src_Makefile_in
View file

@ -6,7 +6,7 @@ This was also a race if MAKE_JOBS > 1.
Index: gettext-tools/src/Makefile.in
--- gettext-tools/src/Makefile.in.orig
+++ gettext-tools/src/Makefile.in
@@ -3413,7 +3413,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
@@ -3819,7 +3819,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
# Need @LTLIBINTL@ because many source files use gettext().
# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
# use iconv().
@ -15,7 +15,7 @@ Index: gettext-tools/src/Makefile.in
../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) \
$(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined \
$(am__append_3) $(am__append_5) $(am__append_7)
@@ -4873,7 +4873,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
@@ -5281,7 +5281,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
# No need to install libgettextsrc.a, except on AIX.