Page MenuHomeFreeBSD
Files F174379248

D56386.id175479.diff
No OneTemporary
Actions

D56386.id175479.diff
View Options

diff --git a/devel/libgnuregex/Makefile b/devel/libgnuregex/Makefile
--- a/devel/libgnuregex/Makefile
+++ b/devel/libgnuregex/Makefile
@@ -15,18 +15,30 @@
USES= uidfix
USE_LDCONFIG= yes
+CFLAGS= -I${WRKSRC}
MAKE_ENV+= INCLUDEDIR="${PREFIX}/include" LIBDIR="${PREFIX}/lib"
-REGEX_FILES= lib/regex.c \
+REGEX_FILES= lib/attribute.h \
+ lib/cdefs.h \
+ lib/dynarray.h \
+ lib/gettext.h \
+ lib/intprops.h \
+ lib/intprops-internal.h \
+ lib/libc-config.h \
+ lib/regex.c \
lib/regex.h \
lib/regex_internal.c \
lib/regex_internal.h \
lib/regexec.c \
- lib/regcomp.c
+ lib/regcomp.c \
+ lib/verify.h
+REGEX_MALLOC_FILES= lib/malloc/dynarray.h \
+ lib/malloc/dynarray-skeleton.c
do-extract:
- ${MKDIR} ${WRKSRC}
+ ${MKDIR} -p ${WRKSRC}/malloc
${CP} -a ${REGEX_FILES:C,^,${LOCALBASE}/share/gnulib/,} ${WRKSRC}
+ ${CP} -a ${REGEX_MALLOC_FILES:C,^,${LOCALBASE}/share/gnulib/,} ${WRKSRC}/malloc
${CP} -a ${FILESDIR}/config.h ${FILESDIR}/gnuregex.h \
${FILESDIR}/Makefile ${WRKSRC}
diff --git a/devel/libgnuregex/files/config.h b/devel/libgnuregex/files/config.h
--- a/devel/libgnuregex/files/config.h
+++ b/devel/libgnuregex/files/config.h
@@ -11,3 +11,5 @@
#define HAVE_ALLOCA 1
#define HAVE_STDBOOL_H 1
#define HAVE_STDINT_H 1
+#define _GL_CONFIG_H_INCLUDED 1
+#define _GL_ATTRIBUTE_FALLTHROUGH __attribute__((fallthrough));
diff --git a/devel/libgnuregex/files/patch-regex.h b/devel/libgnuregex/files/patch-regex.h
--- a/devel/libgnuregex/files/patch-regex.h
+++ b/devel/libgnuregex/files/patch-regex.h
@@ -1,6 +1,6 @@
---- regex.h.orig 2020-12-28 19:24:49 UTC
+--- regex.h.orig 2026-01-27 18:52:19 UTC
+++ regex.h
-@@ -30,7 +30,7 @@ extern "C" {
+@@ -29,7 +29,7 @@ extern "C" {
/* Define __USE_GNU to declare GNU extensions that violate the
POSIX name space rules. */
diff --git a/devel/libgnuregex/files/patch-regex.c b/devel/libgnuregex/files/patch-regex.c
--- a/devel/libgnuregex/files/patch-regex.c
+++ b/devel/libgnuregex/files/patch-regex.c
@@ -1,20 +1,10 @@
---- regex.c.orig 2014-02-03 00:48:46 UTC
+--- regex.c.orig 2026-01-27 18:52:19 UTC
+++ regex.c
-@@ -18,7 +18,7 @@
- <http://www.gnu.org/licenses/>. */
-
- #ifndef _LIBC
--# include <config.h>
-+# include "config.h"
-
- # if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
- # pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
-@@ -64,7 +64,7 @@
+@@ -63,6 +63,7 @@
+ GNU regex allows. Include it before <regex.h>, which correctly
#undefs RE_DUP_MAX and sets it to the right value. */
#include <limits.h>
++#include <stdbool.h>
--#include <regex.h>
-+#include "regex.h"
+ #include <regex.h>
#include "regex_internal.h"
-
- #include "regex_internal.c"
diff --git a/devel/libgnuregex/files/patch-regex__internal.h b/devel/libgnuregex/files/patch-regex__internal.h
deleted file mode 100644
--- a/devel/libgnuregex/files/patch-regex__internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- regex_internal.h.orig 2020-12-28 19:25:52 UTC
-+++ regex_internal.h
-@@ -481,7 +481,7 @@ static unsigned int re_string_context_at (const re_str
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-
--#if defined _LIBC || HAVE_ALLOCA
-+#if defined _LIBC || (HAVE_ALLOCA && HAVE_ALLOCA_H)
- # include <alloca.h>
- #endif
-

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 7:34 PM (3 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40147378
Default Alt Text
D56386.id175479.diff (3 KB)

Event Timeline