From fd7a0a8a5991679842be9d9363c3de32d34c034f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 30 Jan 2012 18:06:46 +0100
Subject: [PATCH] ncurses-libs: install shlibs to /usr/lib.
---
srcpkgs/ncurses/ncurses-libs.template | 12 +++---------
srcpkgs/ncurses/template | 4 ----
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/ncurses/ncurses-libs.template b/srcpkgs/ncurses/ncurses-libs.template
index 541074dc97..d8d6e31981 100644
--- a/srcpkgs/ncurses/ncurses-libs.template
+++ b/srcpkgs/ncurses/ncurses-libs.template
@@ -1,6 +1,6 @@
# Template file for 'ncurses-libs'.
#
-revision=1
+revision=2
short_desc="${sourcepkg} shared libraries"
long_desc="${long_desc}
@@ -9,13 +9,7 @@ long_desc="${long_desc}
replaces="ncursesw>=0"
Add_dependency run ncurses-base
-do_install()
-{
- mkdir -p ${DESTDIR}/lib
- mkdir -p ${DESTDIR}/usr/lib
-
- mv ${SRCPKGDESTDIR}/lib/* ${DESTDIR}/lib
- chmod 755 ${DESTDIR}/lib/*
- mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
+do_install() {
+ vmove "usr/lib/*.so*" usr/lib
chmod 755 ${DESTDIR}/usr/lib/*.so*
}
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 90c8a3daaf..2b1ccfa5a7 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -44,10 +44,6 @@ do_install() {
cd ${wrksrc}/ncursesw-build
make install
- install -dm755 ${DESTDIR}/lib
- mv ${DESTDIR}/usr/lib/libncursesw.so.* ${DESTDIR}/lib
- ln -sf ../../lib/libncursesw.so.6 ${DESTDIR}/usr/lib/libncursesw.so
-
# Fool packages looking to link to non-wide-character ncurses libraries
for lib in curses ncurses form panel menu; do
rm -f ${DESTDIR}/usr/lib/lib${lib}.so