From 39891b05e7d2c098ea868a88fd5e4bd9d9948932 Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Mon, 30 Jan 2012 17:04:41 +0100 Subject: [PATCH] readline: apply 6.2 patches correctly. --- srcpkgs/readline/template | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 1e60c8f59b..38ccf2b48f 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -3,6 +3,7 @@ pkgname=readline _dist_ver=6.2 _patch_ver=002 version=${_dist_ver}.${_patch_ver} +revision=1 #version=${_dist_ver} wrksrc=${pkgname}-${_dist_ver} distfiles="http://ftp.gnu.org/gnu/readline/${pkgname}-${_dist_ver}.tar.gz" @@ -24,35 +25,21 @@ long_desc=" subpackages="$pkgname-devel" Add_dependency build ncurses-devel -pre_configure() -{ - local url="http://ftp.gnu.org/gnu/$pkgname/$pkgname-6.1-patches" +pre_configure() { + local url="http://ftp.gnu.org/gnu/$pkgname/$pkgname-${_dist_ver}-patches" if [ "${_patch_ver}" -gt 000 ]; then for p in $(seq -w 001 ${_patch_ver}); do cd ${XBPS_SRCDISTDIR} || return 1 - [ -f ${XBPS_SRCDISTDIR}/readline61-${p} ] && continue - msg_normal " Fetching $url/readline61-$p ...\n" - $XBPS_FETCH_CMD ${url}/readline61-$p + [ -f ${XBPS_SRCDISTDIR}/readline62-${p} ] && continue + msg_normal " Fetching $url/readline62-$p ...\n" + $XBPS_FETCH_CMD ${url}/readline62-$p done fi cd ${wrksrc} for p in $(seq -w 001 ${_patch_ver}); do - patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline61-${p} && \ - msg_normal " Applying patch readline61-$p.\n" + patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline62-${p} && \ + msg_normal " Applying patch readline62-$p.\n" done sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf } - -post_install() -{ - # Move shared libs to /. - mkdir -p ${DESTDIR}/lib - mv ${DESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/lib - chmod 755 ${DESTDIR}/lib/*.so* - rm -f ${DESTDIR}/usr/lib/*.so - for f in history readline; do - cd ${DESTDIR}/usr/lib && \ - ln -s ../../lib/lib${f}.so.6 lib${f}.so - done -}