From 8582e1e5cd2fa937633eacbdd583d2dd9a35d8ea Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jul 2011 19:01:05 +0200
Subject: [PATCH] ncurses32: update to 5.9.

---
 srcpkgs/ncurses32/ncurses32-devel.template |  3 +-
 srcpkgs/ncurses32/template                 | 40 ++++++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/ncurses32/ncurses32-devel.template b/srcpkgs/ncurses32/ncurses32-devel.template
index 4d03be9b65..115bb5a91e 100644
--- a/srcpkgs/ncurses32/ncurses32-devel.template
+++ b/srcpkgs/ncurses32/ncurses32-devel.template
@@ -10,6 +10,5 @@ Add_dependency run ncurses32
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib32
-	mv ${SRCPKGDESTDIR}/usr/lib32/*.a ${DESTDIR}/usr/lib32
+	vmove "usr/lib32/*.a" usr/lib32
 }
diff --git a/srcpkgs/ncurses32/template b/srcpkgs/ncurses32/template
index d8906db5b8..db63c3ed91 100644
--- a/srcpkgs/ncurses32/template
+++ b/srcpkgs/ncurses32/template
@@ -1,19 +1,15 @@
 # Template file for 'ncurses32'
 pkgname=ncurses32
-version=5.7
+version=5.9
 distfiles="
-http://xbps.nopcode.org/repos/stable/i686/ncurses-libs-${version}_1.i686.xbps
-http://xbps.nopcode.org/repos/stable/i686/ncurses-devel-${version}_2.i686.xbps
-http://xbps.nopcode.org/repos/stable/i686/ncursesw-${version}_1.i686.xbps
-http://xbps.nopcode.org/repos/stable/i686/ncursesw-devel-${version}_1.i686.xbps"
+http://xbps.nopcode.org/repos/current/i686/ncurses-libs-${version}.i686.xbps
+http://xbps.nopcode.org/repos/current/i686/ncurses-devel-${version}.i686.xbps"
 build_style=custom-install
 short_desc="A System V Release 4.0 curses emulation library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-0470e12a72e923b8983a314b7f35c909ac3ec6c2ac8467d831d2cb24c506edd2
-b0d842501144406ad3f5b761908070058d5467ca976534bbf39dfa8918859cb9
-49a906ccec204c543db152e109a09e89d1aa0382c3c473dc791341a93f5aa36b
-18777c0f140b3052099d5cae9a96628403322aa9af3b3d11241bb80b40d81603"
+1a4593225d3d4bc96d423c1dae519d4b0271fd20007065a6751d044a2b7cca6c
+59318d6cebe8f839a26d4a6114762bbec9d49a0dcaf1bbee5e25fd296a82cb31"
 long_desc="
  The ncurses (new curses) library is a freeware emulation of System V Release
  4.0 curses. It uses terminfo format, supports pads and color and multiple
@@ -23,8 +19,7 @@ long_desc="
  ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
  Full manual pages are provided for the library and tools.
 
- This package installs the ncurses and ncursesw 32 bit libraries for
- x86_64 systems."
+ This package installs the ncurses 32 bit libraries for x86_64 systems."
 
 subpackages="$pkgname-devel"
 nostrip=yes
@@ -39,18 +34,27 @@ do_install()
 {
 	for f in ${distfiles}; do
 		local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})"
-		bsdtar xf ${srcfile} -C ${wrksrc} || return 1
+		bsdtar xf ${srcfile} -C ${wrksrc}
 	done
 
-	install -d ${DESTDIR}/lib32 ${DESTDIR}/usr/lib32
-	cp -a ${wrksrc}/lib/*.so* ${DESTDIR}/lib32
-	cp -a ${wrksrc}/usr/lib/*.{a,so*} ${DESTDIR}/usr/lib32
+	vmkdir lib32
+	vmkdir usr/lib32
+
+	vcopy "lib/*.so*" lib32
+	vcopy "usr/lib/*.a" usr/lib32
+	vcopy "usr/lib/*.so*" usr/lib32
 	mv ${DESTDIR}/usr/lib32/*.so.${version} ${DESTDIR}/lib32
+
 	rm -f ${DESTDIR}/usr/lib32/*.so*
+
 	# Remake the symlinks with proper path to /lib32.
 	for f in panel panelw form formw menu menuw ncurses ncursesw; do
-		cd ${DESTDIR}/usr/lib32 && \
-			ln -sf ../../lib32/lib${f}.so.${version} lib${f}.so && \
-			ln -sf ../../lib32/lib${f}.so.${version} lib${f}.so.5
+		ver=$version
+		if [ ! -f "${DESTDIR}/lib32/lib${f}.so.${version}" ]; then
+			ver="6.0"
+		fi
+		ln -sf /lib32/lib${f}.so.${ver} ${DESTDIR}/usr/lib32/lib${f}.so
+		ln -sf /lib32/lib${f}.so.${ver} \
+			${DESTDIR}/usr/lib32/lib${f}.so.${ver%.*}
 	done
 }