From 8bd4fbbb79fe967a02b80c4de77616fd8cdf83a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 16 May 2018 22:03:10 +0200 Subject: [PATCH] readline: update to 7.0.003. Closes #14469. Signed-off-by: Enno Boland --- srcpkgs/readline/template | 17 +++++++++-------- srcpkgs/readline/update | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/readline/update diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 74ff11bf4f5..773383cfaac 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -1,7 +1,7 @@ # Template build file for 'readline'. pkgname=readline _dist_ver=7.0 -_patch_ver=000 +_patch_ver=003 version=${_dist_ver}.${_patch_ver} revision=1 wrksrc=${pkgname}-${_dist_ver} @@ -10,8 +10,8 @@ configure_args="--with-curses --enable-multibyte" makedepends="ncurses-devel" short_desc="The GNU Readline Library" maintainer="Juan RP " -homepage="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -license="GPL-3" +homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" +license="GPL-3.0-or-later" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_dist_ver}.tar.gz" checksum=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 @@ -21,17 +21,18 @@ pre_configure() { cd ${XBPS_SRCDISTDIR}/${pkgname}-${version} if [ "${_patch_ver}" -gt 000 ]; then for p in $(seq -w 001 ${_patch_ver}); do - if [ -f readline63-${p} ]; then + if [ -f readline${version/./}-${p} ]; then continue fi - msg_normal " Fetching $url/readline63-$p ...\n" - $XBPS_FETCH_CMD ${url}/readline63-$p + local patch_url="${url}/readline${_dist_ver/./}-${p}" + msg_normal " Fetching ${patch_url} ...\n" + $XBPS_FETCH_CMD "${patch_url}" done fi cd ${wrksrc} for p in $(seq -w 001 ${_patch_ver}); do - patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline63-${p} - msg_normal " Applying patch readline63-$p.\n" + patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p} + msg_normal " Applying patch readline${_dist_ver/./}-$p.\n" done sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf } diff --git a/srcpkgs/readline/update b/srcpkgs/readline/update new file mode 100644 index 00000000000..034db99ab52 --- /dev/null +++ b/srcpkgs/readline/update @@ -0,0 +1,3 @@ +site="https://git.savannah.gnu.org/cgit/readline.git" +pattern="(readline-\K[\d.]+(?=\.tar.gz))|(Readline-\K[\d.]+ patch \d+)" +version="${_dist_ver} patch ${_patch_ver}"