diff --git a/devel/readline/Makefile b/devel/readline/Makefile --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,6 +1,6 @@ PORTNAME= readline PORTVERSION= 8.2.${PATCHLEVEL} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU DISTNAME= readline-${PORTVERSION:R} diff --git a/devel/readline/files/patch-clang18 b/devel/readline/files/patch-clang18 --- a/devel/readline/files/patch-clang18 +++ b/devel/readline/files/patch-clang18 @@ -1,28 +1,31 @@ ---- readline.h.orig 2024-09-21 16:56:41 UTC +--- readline.h.orig 2022-02-18 16:13:59 UTC +++ readline.h -@@ -407,7 +407,7 @@ extern int rl_message (const char *, ...) __attribute - #if defined (USE_VARARGS) && defined (PREFER_STDARG) +@@ -404,10 +404,10 @@ extern int rl_mark_active_p (void); + extern void rl_deactivate_mark (void); + extern int rl_mark_active_p (void); + +-#if defined (USE_VARARGS) && defined (PREFER_STDARG) ++#if defined(__GNUC__) || defined(__clang__) extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2))); #else -extern int rl_message (); -+extern int rl_message (void); ++extern int rl_message (const char *, ...); #endif extern int rl_show_char (int); --- rltypedefs.h.orig 2021-01-22 15:04:18 UTC +++ rltypedefs.h -@@ -32,10 +32,10 @@ extern "C" { +@@ -32,10 +32,13 @@ extern "C" { # define _FUNCTION_DEF #if defined(__GNUC__) || defined(__clang__) --typedef int Function () __attribute__((deprecated)); --typedef void VFunction () __attribute__((deprecated)); --typedef char *CPFunction () __attribute__((deprecated)); --typedef char **CPPFunction () __attribute__((deprecated)); -+typedef int Function (void) __attribute__((deprecated)); -+typedef void VFunction (void) __attribute__((deprecated)); -+typedef char *CPFunction (void) __attribute__((deprecated)); -+typedef char **CPPFunction (void) __attribute__((deprecated)); ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wstrict-prototypes" + typedef int Function () __attribute__((deprecated)); + typedef void VFunction () __attribute__((deprecated)); + typedef char *CPFunction () __attribute__((deprecated)); + typedef char **CPPFunction () __attribute__((deprecated)); ++#pragma GCC diagnostic pop #else typedef int Function (); typedef void VFunction ();