From da5d047b8885f2facd1e7d3c7455099bd5222bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Thu, 17 Jun 2021 10:17:54 +0200 Subject: groups/{211,221,231,241,251}: libreadline: rename to readline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- groups/211.native_packages_cmdline.group | 6 +++--- groups/221.native_packages_dev.group | 6 +++--- groups/231.native_packages_etc.group | 2 +- groups/241.native_packages_inet.group | 2 +- groups/251.native_packages_lib.group | 18 +++++++++--------- patches/libreadline-7.0.local.patch | 1 - patches/libreadline-8.1.local.patch | 12 ------------ patches/readline-8.1.local.patch | 12 ++++++++++++ 8 files changed, 29 insertions(+), 30 deletions(-) delete mode 120000 patches/libreadline-7.0.local.patch delete mode 100644 patches/libreadline-8.1.local.patch create mode 100644 patches/readline-8.1.local.patch diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index f206de9..0336ac0 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -70,7 +70,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_FINDUTILS_SHA256SUM:=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164}; : ${PKG_FINDUTILS_VERSION:=4.8.0}; : ${PKG_FINDUTILS_URL:=https://ftp.gnu.org/gnu/findutils/findutils-${PKG_FINDUTILS_VERSION}.tar.xz}; -: ${PKG_GAWK_DEPENDS:="libreadline"}; +: ${PKG_GAWK_DEPENDS:="readline"}; : ${PKG_GAWK_SHA256SUM:=cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd}; : ${PKG_GAWK_VERSION:=5.1.0}; : ${PKG_GAWK_URL:=https://ftp.gnu.org/gnu/gawk/gawk-${PKG_GAWK_VERSION}.tar.xz}; @@ -142,7 +142,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_OPENBSD_BASEUTILS_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"}; : ${PKG_OPENBSD_BASEUTILS_INSTALL_FILES:="../baseutils/pax/pax=bin/ ../baseutils/pax/cpio.1=share/man/man1/ ../baseutils/pax/pax.1=share/man/man1/ ../baseutils/pax/tar.1=share/man/man1/"}; : ${PKG_OPENBSD_BASEUTILS_MAKE_SUBDIRS:="libopenbsd pax"}; -: ${PKG_PROFANITY_DEPENDS:="libffi libstrophe libgcrypt libz glib gpgme ncursesw curl libreadline sqlite3"}; +: ${PKG_PROFANITY_DEPENDS:="libffi libstrophe libgcrypt libz glib gpgme ncursesw curl readline sqlite3"}; : ${PKG_PROFANITY_SHA256SUM:=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902}; : ${PKG_PROFANITY_VERSION:=0.9.5}; : ${PKG_PROFANITY_URL:=https://profanity-im.github.io/profanity-${PKG_PROFANITY_VERSION}.tar.gz}; @@ -157,7 +157,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_PV_URL:=https://www.ivarch.com/programs/sources/pv-${PKG_PV_VERSION}.tar.bz2}; : ${PKG_PV_DEBUG_CONFIGURE_ARGS_EXTRA:=--enable-debugging}; : ${PKG_PV_MAKEFLAGS_BUILD:="LD=${DEFAULT_TARGET}-ld"}; -: ${PKG_RC_DEPENDS:="libreadline ncurses"}; +: ${PKG_RC_DEPENDS:="ncurses readline"}; : ${PKG_RC_SHA256SUM:=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8}; : ${PKG_RC_VERSION:=1.7.4}; : ${PKG_RC_URL:=https://mirror.midipix.org/rc/rc-${PKG_RC_VERSION}.tar.gz}; diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index 9535329..e1ecf5b 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -5,7 +5,7 @@ GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " bison chicken cparser cssc diffutils flex gdb gengetopt indent lua lunix m4 make mandoc nasm patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")"; -: ${PKG_BISON_DEPENDS:="libreadline"}; +: ${PKG_BISON_DEPENDS:="readline"}; : ${PKG_BISON_SHA256SUM:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf}; : ${PKG_BISON_VERSION:=3.7.6}; : ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_VERSION}.tar.xz}; @@ -107,7 +107,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_POSIX_CC_SHA256SUM:=bd90442d98714f874b6e7e62fa8376ddca282c2174dc582917ecab773f96c095}; : ${PKG_POSIX_CC_VERSION:=1.4}; : ${PKG_POSIX_CC_URL:=https://mirror.midipix.org/posix_cc/posix_cc-${PKG_POSIX_CC_VERSION}.tar.bz2}; -: ${PKG_PYTHON2_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3"}; +: ${PKG_PYTHON2_DEPENDS:="bzip2 curl expat gdbm libffi libressl libz ncursesw readline sqlite3"}; : ${PKG_PYTHON2_SHA256SUM:=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43}; : ${PKG_PYTHON2_VERSION:=2.7.18}; : ${PKG_PYTHON2_URL:="https://www.python.org/ftp/python/${PKG_PYTHON2_VERSION}/Python-${PKG_PYTHON2_VERSION}.tar.xz"}; @@ -119,7 +119,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_PYTHON2_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON2_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"}; : ${PKG_PYTHON2_SUBDIR:=Python-${PKG_PYTHON2_VERSION}}; -: ${PKG_PYTHON3_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3 xz"}; +: ${PKG_PYTHON3_DEPENDS:="bzip2 curl expat gdbm libffi libressl libz ncursesw readline sqlite3 xz"}; : ${PKG_PYTHON3_SHA256SUM:=ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91}; : ${PKG_PYTHON3_VERSION:=3.6.3}; : ${PKG_PYTHON3_URL:="https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz"}; diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 5d40db8..f3b4153 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -408,7 +408,7 @@ zstd")"; : ${PKG_SLANG_URL:=https://www.jedsoft.org/releases/slang/slang-${PKG_SLANG_VERSION}.tar.bz2}; : ${PKG_SLANG_IN_TREE:=1}; : ${PKG_SLANG_MAKEFLAGS_BUILD_EXTRA:=-j1}; -: ${PKG_SQLITE3_DEPENDS:="libreadline ncurses"}; +: ${PKG_SQLITE3_DEPENDS:="ncurses readline"}; : ${PKG_SQLITE3_SHA256SUM:=f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0}; : ${PKG_SQLITE3_VERSION:=3350500}; : ${PKG_SQLITE3_URL:=https://sqlite.org/2021/sqlite-autoconf-${PKG_SQLITE3_VERSION}.tar.gz}; diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 06d4a14..d14669c 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -116,7 +116,7 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_LINKS_VERSION:=2.21}; : ${PKG_LINKS_URL:=http://links.twibright.com/download/links-${PKG_LINKS_VERSION}.tar.bz2}; : ${PKG_LINKS_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --disable-graphics --without-freetype"}; -: ${PKG_LYNX_DEPENDS:="libreadline gnutls ncursesw"}; +: ${PKG_LYNX_DEPENDS:="gnutls ncursesw readline"}; : ${PKG_LYNX_SHA256SUM:=6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7}; : ${PKG_LYNX_VERSION:=2.8.8rel.2}; : ${PKG_LYNX_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/lynx/lynx${PKG_LYNX_VERSION}.tar.bz2}; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 04550d4..4934de7 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -157,15 +157,6 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image : ${PKG_LIBRESSL_VERSION:=3.3.3}; : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz}; : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc}; -: ${PKG_LIBREADLINE_DEPENDS:="ncurses ncursestw ncursesw"}; -: ${PKG_LIBREADLINE_SHA256SUM:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02}; -: ${PKG_LIBREADLINE_VERSION:=8.1}; -: ${PKG_LIBREADLINE_URL:=https://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz}; -: ${PKG_LIBREADLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"}; -: ${PKG_LIBREADLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; -: ${PKG_LIBREADLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"}; -: ${PKG_LIBREADLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }-L${PREFIX_NATIVE}/lib"}; -: ${PKG_LIBREADLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="}; : ${PKG_LIBSASL2_DEPENDS:="libressl"}; : ${PKG_LIBSASL2_SHA256SUM:=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5}; : ${PKG_LIBSASL2_VERSION:=2.1.27}; @@ -303,6 +294,15 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image : ${PKG_NETTLE_CONFIGURE_ARGS_EXTRA:=--disable-fat}; : ${PKG_NETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1}; +: ${PKG_READLINE_DEPENDS:="ncurses ncursestw ncursesw"}; +: ${PKG_READLINE_SHA256SUM:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02}; +: ${PKG_READLINE_VERSION:=8.1}; +: ${PKG_READLINE_URL:=https://ftp.gnu.org/gnu/readline/readline-${PKG_READLINE_VERSION}.tar.gz}; +: ${PKG_READLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"}; +: ${PKG_READLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; +: ${PKG_READLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"}; +: ${PKG_READLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }-L${PREFIX_NATIVE}/lib"}; +: ${PKG_READLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="}; : ${PKG_SDL1_DEPENDS:="w32api w32lib"}; : ${PKG_SDL1_SHA256SUM:=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00}; : ${PKG_SDL1_VERSION:=1.2.15}; diff --git a/patches/libreadline-7.0.local.patch b/patches/libreadline-7.0.local.patch deleted file mode 120000 index c9a0e19..0000000 --- a/patches/libreadline-7.0.local.patch +++ /dev/null @@ -1 +0,0 @@ -libreadline-8.1.local.patch \ No newline at end of file diff --git a/patches/libreadline-8.1.local.patch b/patches/libreadline-8.1.local.patch deleted file mode 100644 index 02c95e3..0000000 --- a/patches/libreadline-8.1.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/shlib/Makefile.in b/shlib/Makefile.in ---- a/shlib/Makefile.in 2020-10-29 19:47:57.000000000 +0000 -+++ b/shlib/Makefile.in 2021-06-17 07:47:34.626966115 +0000 -@@ -83,7 +83,7 @@ - - SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ - SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ --SHOBJ_LIBS = @SHOBJ_LIBS@ -+SHOBJ_LIBS = @SHOBJ_LIBS@ $(TERMCAP_LIB) - - SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ - SHLIB_LIBS = @SHLIB_LIBS@ diff --git a/patches/readline-8.1.local.patch b/patches/readline-8.1.local.patch new file mode 100644 index 0000000..02c95e3 --- /dev/null +++ b/patches/readline-8.1.local.patch @@ -0,0 +1,12 @@ +diff -ru a/shlib/Makefile.in b/shlib/Makefile.in +--- a/shlib/Makefile.in 2020-10-29 19:47:57.000000000 +0000 ++++ b/shlib/Makefile.in 2021-06-17 07:47:34.626966115 +0000 +@@ -83,7 +83,7 @@ + + SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ + SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ +-SHOBJ_LIBS = @SHOBJ_LIBS@ ++SHOBJ_LIBS = @SHOBJ_LIBS@ $(TERMCAP_LIB) + + SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ + SHLIB_LIBS = @SHLIB_LIBS@ -- cgit v1.2.3