diff options
Diffstat (limited to 'devel/readline')
| -rw-r--r-- | devel/readline/Makefile | 8 | ||||
| -rw-r--r-- | devel/readline/distinfo | 34 | ||||
| -rw-r--r-- | devel/readline/files/patch-clang18 | 31 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-readline.3 | 32 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-readline.info | 28 | ||||
| -rw-r--r-- | devel/readline/files/patch-doc-rluserman.info | 28 | ||||
| -rw-r--r-- | devel/readline/pkg-plist | 13 |
7 files changed, 68 insertions, 106 deletions
diff --git a/devel/readline/Makefile b/devel/readline/Makefile index 72ea4704033c..7580b39e2aea 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,6 +1,5 @@ PORTNAME= readline -PORTVERSION= 8.2.${PATCHLEVEL} -PORTREVISION= 2 +PORTVERSION= 8.3.${PATCHLEVEL} CATEGORIES= devel MASTER_SITES= GNU DISTNAME= readline-${PORTVERSION:R} @@ -21,13 +20,12 @@ USE_LDCONFIG= yes INFO= history readline rluserman PLIST_SUB= PORTVERSION=${PORTVERSION:R} -PORTDOCS= CHANGES INSTALL README CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R} -# https://ftp.gnu.org/gnu/readline/readline-8.2-patches/ -PATCHES= 1 2 3 4 5 6 7 8 9 10 11 12 13 +# https://ftp.gnu.org/gnu/readline/readline-8.3-patches/ +PATCHES= 1 .if defined(PATCHES) CPE_UPDATE= ${PATCHLEVEL} PATCHLEVEL= ${PATCHES:On:[-1]} diff --git a/devel/readline/distinfo b/devel/readline/distinfo index a054442b7fc2..3d5d78345106 100644 --- a/devel/readline/distinfo +++ b/devel/readline/distinfo @@ -1,29 +1,5 @@ -TIMESTAMP = 1724084516 -SHA256 (readline-8.2.tar.gz) = 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 -SIZE (readline-8.2.tar.gz) = 3043952 -SHA256 (readline82-001) = bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7 -SIZE (readline82-001) = 1198 -SHA256 (readline82-002) = e06503822c62f7bc0d9f387d4c78c09e0ce56e53872011363c74786c7cd4c053 -SIZE (readline82-002) = 1134 -SHA256 (readline82-003) = 24f587ba46b46ed2b1868ccaf9947504feba154bb8faabd4adaea63ef7e6acb0 -SIZE (readline82-003) = 1201 -SHA256 (readline82-004) = 79572eeaeb82afdc6869d7ad4cba9d4f519b1218070e17fa90bbecd49bd525ac -SIZE (readline82-004) = 1708 -SHA256 (readline82-005) = 622ba387dae5c185afb4b9b20634804e5f6c1c6e5e87ebee7c35a8f065114c99 -SIZE (readline82-005) = 1501 -SHA256 (readline82-006) = c7b45ff8c0d24d81482e6e0677e81563d13c74241f7b86c4de00d239bc81f5a1 -SIZE (readline82-006) = 3031 -SHA256 (readline82-007) = 5911a5b980d7900aabdbee483f86dab7056851e6400efb002776a0a4a1bab6f6 -SIZE (readline82-007) = 1422 -SHA256 (readline82-008) = a177edc9d8c9f82e8c19d0630ab351f3fd1b201d655a1ddb5d51c4cee197b26a -SIZE (readline82-008) = 1697 -SHA256 (readline82-009) = 3d9885e692e1998523fd5c61f558cecd2aafd67a07bd3bfe1d7ad5a31777a116 -SIZE (readline82-009) = 2270 -SHA256 (readline82-010) = 758e2ec65a0c214cfe6161f5cde3c5af4377c67d820ea01d13de3ca165f67b4c -SIZE (readline82-010) = 2653 -SHA256 (readline82-011) = e0013d907f3a9e6482cc0934de1bd82ee3c3c4fd07a9646aa9899af237544dd7 -SIZE (readline82-011) = 1865 -SHA256 (readline82-012) = 6c8adf8ed4a2ca629f7fd11301ed6293a6248c9da0c674f86217df715efccbd3 -SIZE (readline82-012) = 2824 -SHA256 (readline82-013) = 1ea434957d6ec3a7b61763f1f3552dad0ebdd6754d65888b5cd6d80db3a788a8 -SIZE (readline82-013) = 5757 +TIMESTAMP = 1752265716 +SHA256 (readline-8.3.tar.gz) = fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc +SIZE (readline-8.3.tar.gz) = 3419642 +SHA256 (readline83-001) = 21f0a03106dbe697337cd25c70eb0edbaa2bdb6d595b45f83285cdd35bac84de +SIZE (readline83-001) = 1846 diff --git a/devel/readline/files/patch-clang18 b/devel/readline/files/patch-clang18 deleted file mode 100644 index df9e8b671ddc..000000000000 --- a/devel/readline/files/patch-clang18 +++ /dev/null @@ -1,31 +0,0 @@ ---- readline.h.orig 2022-02-18 16:13:59 UTC -+++ readline.h -@@ -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 (const char *, ...); - #endif - - extern int rl_show_char (int); ---- rltypedefs.h.orig 2021-01-22 15:04:18 UTC -+++ rltypedefs.h -@@ -32,10 +32,13 @@ extern "C" { - # define _FUNCTION_DEF - - #if defined(__GNUC__) || defined(__clang__) -+#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 (); diff --git a/devel/readline/files/patch-doc-readline.3 b/devel/readline/files/patch-doc-readline.3 index d7d7b3631b32..41a76b97d73c 100644 --- a/devel/readline/files/patch-doc-readline.3 +++ b/devel/readline/files/patch-doc-readline.3 @@ -1,25 +1,27 @@ ---- doc/readline.3.orig 2020-10-29 20:48:10 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/readline.3.orig 2025-02-03 15:12:54 UTC +++ doc/readline.3 -@@ -118,7 +118,7 @@ The name of this file is taken from the value of the - environment variable. If that variable is unset, the default is - .IR ~/.inputrc . - If that file does not exist or cannot be read, the ultimate default is +@@ -180,7 +180,7 @@ If that file does not exist or cannot be read, \fBrea + If that variable is unset, the default is + .IR \*~/.inputrc . + If that file does not exist or cannot be read, \fBreadline\fP looks for -.IR /etc/inputrc . +.IR %%PREFIX%%/etc/inputrc . - When a program which uses the readline library starts up, the - init file is read, and the key bindings and variables are set. - There are only a few basic constructs allowed in the -@@ -722,11 +722,11 @@ the test fails. - .IP \fB$include\fP + When a program that uses the \fBreadline\fP library starts up, + \fBreadline\fP reads the initialization file + and sets the key bindings and variables found there, +@@ -936,11 +936,11 @@ and key bindings from that file. + .B $include This directive takes a single filename as an argument and reads commands - and bindings from that file. For example, the following directive --would read \fI/etc/inputrc\fP: -+would read \fI%%PREFIX%%/etc/inputrc\fP: - .sp 1 + and key bindings from that file. +-For example, the following directive would read \fI/etc/inputrc\fP: ++For example, the following directive would read \fI%%PREFIX%%/etc/inputrc\fP: + .PP .RS .nf -\fB$include\fP \^ \fI/etc/inputrc\fP +\fB$include\fP \^ \fI%%PREFIX%%/etc/inputrc\fP - .fi + .fi .RE .SH SEARCHING diff --git a/devel/readline/files/patch-doc-readline.info b/devel/readline/files/patch-doc-readline.info index 6eb3350f6d4d..3ac09ea4dafe 100644 --- a/devel/readline/files/patch-doc-readline.info +++ b/devel/readline/files/patch-doc-readline.info @@ -1,21 +1,23 @@ ---- doc/readline.info.orig 2020-10-30 14:07:51 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/readline.info.orig 2025-03-31 14:28:42 UTC +++ doc/readline.info -@@ -313,7 +313,7 @@ putting commands in an "inputrc" file, conventionally +@@ -327,7 +327,7 @@ is ‘~/.inputrc’. If that file does not exist or c directory. The name of this file is taken from the value of the - environment variable 'INPUTRC'. If that variable is unset, the default - is '~/.inputrc'. If that file does not exist or cannot be read, the --ultimate default is '/etc/inputrc'. -+ultimate default is '%%PREFIX%%/etc/inputrc'. + environment variable ‘INPUTRC’. If that variable is unset, the default + is ‘~/.inputrc’. If that file does not exist or cannot be read, +-Readline looks for ‘/etc/inputrc’. ++Readline looks for ‘%%PREFIX%%/etc/inputrc’. - When a program which uses the Readline library starts up, the init - file is read, and the key bindings are set. -@@ -853,8 +853,8 @@ four parser directives used. - '$include' + When a program that uses the Readline library starts up, Readline + reads the init file and sets any variables and key bindings it contains. +@@ -954,8 +954,8 @@ four parser directives available. + ‘$include’ This directive takes a single filename as an argument and reads - commands and bindings from that file. For example, the following -- directive reads from '/etc/inputrc': + commands and key bindings from that file. For example, the +- following directive reads from ‘/etc/inputrc’: - $include /etc/inputrc -+ directive reads from '%%PREFIX%%/etc/inputrc': ++ following directive reads from ‘%%PREFIX%%/etc/inputrc’: + $include %%PREFIX%%/etc/inputrc diff --git a/devel/readline/files/patch-doc-rluserman.info b/devel/readline/files/patch-doc-rluserman.info index 332ba1fc1715..1f1fcdc23b9f 100644 --- a/devel/readline/files/patch-doc-rluserman.info +++ b/devel/readline/files/patch-doc-rluserman.info @@ -1,21 +1,23 @@ ---- doc/rluserman.info.orig 2020-10-30 14:07:52 UTC +% sed -i .orig 's|/etc/inputrc|%%PREFIX%%&|g' doc/readline.3 doc/readline.info doc/rluserman.info + +--- doc/rluserman.info.orig 2025-03-31 14:28:42 UTC +++ doc/rluserman.info -@@ -311,7 +311,7 @@ putting commands in an "inputrc" file, conventionally +@@ -325,7 +325,7 @@ is ‘~/.inputrc’. If that file does not exist or c directory. The name of this file is taken from the value of the - environment variable 'INPUTRC'. If that variable is unset, the default - is '~/.inputrc'. If that file does not exist or cannot be read, the --ultimate default is '/etc/inputrc'. -+ultimate default is '%%PREFIX%%/etc/inputrc'. + environment variable ‘INPUTRC’. If that variable is unset, the default + is ‘~/.inputrc’. If that file does not exist or cannot be read, +-Readline looks for ‘/etc/inputrc’. ++Readline looks for ‘%%PREFIX%%/etc/inputrc’. - When a program which uses the Readline library starts up, the init - file is read, and the key bindings are set. -@@ -851,8 +851,8 @@ four parser directives used. - '$include' + When a program that uses the Readline library starts up, Readline + reads the init file and sets any variables and key bindings it contains. +@@ -952,8 +952,8 @@ four parser directives available. + ‘$include’ This directive takes a single filename as an argument and reads - commands and bindings from that file. For example, the following -- directive reads from '/etc/inputrc': + commands and key bindings from that file. For example, the +- following directive reads from ‘/etc/inputrc’: - $include /etc/inputrc -+ directive reads from '%%PREFIX%%/etc/inputrc': ++ following directive reads from ‘%%PREFIX%%/etc/inputrc’: + $include %%PREFIX%%/etc/inputrc diff --git a/devel/readline/pkg-plist b/devel/readline/pkg-plist index 75a5579b3aed..b24438ecfdfa 100644 --- a/devel/readline/pkg-plist +++ b/devel/readline/pkg-plist @@ -16,17 +16,30 @@ lib/libreadline.so.8 lib/libreadline.so.%%PORTVERSION%% libdata/pkgconfig/history.pc libdata/pkgconfig/readline.pc +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/history.html +%%PORTDOCS%%%%DOCSDIR%%/readline.html +%%PORTDOCS%%%%DOCSDIR%%/rluserman.html share/man/man3/history.3.gz share/man/man3/readline.3.gz %%DATADIR%%/excallback.c %%DATADIR%%/fileman.c +%%DATADIR%%/hist_erasedups.c +%%DATADIR%%/hist_purgecmd.c %%DATADIR%%/histexamp.c %%DATADIR%%/manexamp.c +%%DATADIR%%/rl-callbacktest.c +%%DATADIR%%/rl-callbacktest2.c +%%DATADIR%%/rl-callbacktest3.c %%DATADIR%%/rl-fgets.c +%%DATADIR%%/rl-timeout.c %%DATADIR%%/rl.c %%DATADIR%%/rlbasic.c %%DATADIR%%/rlcat.c %%DATADIR%%/rlevent.c +%%DATADIR%%/rlkeymaps.c %%DATADIR%%/rlptytest.c %%DATADIR%%/rltest.c %%DATADIR%%/rlversion.c |