From cba079d24af13f3a165c6c254399b5c65515cd8c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 18 Jul 2018 21:06:12 -0500
Subject: system/ncurses: install to /lib not /usr/lib

---
 system/ncurses/APKBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'system/ncurses')

diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD
index 6e30b566a..1a091ec5c 100644
--- a/system/ncurses/APKBUILD
+++ b/system/ncurses/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ncurses
 pkgver=6.1_p20180609
 _ver=${pkgver%_p*}-${pkgver#*_p}
-pkgrel=2
+pkgrel=3
 pkgdesc="Console display library"
 url="https://invisible-island.net/ncurses/ncurses.html"
 arch="all"
@@ -28,6 +28,7 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
+		--libdir=/lib \
 		--mandir=/usr/share/man \
 		--without-ada \
 		--without-tests \
@@ -67,12 +68,12 @@ dev() {
 	default_dev
 	# force link against *w.so
 	for lib in ncurses ncurses++ form panel menu tinfo; do
-		echo "INPUT(-l${lib}w)" > "$subpkgdir"/usr/lib/lib${lib}.so
+		echo "INPUT(-l${lib}w)" > "$subpkgdir"/lib/lib${lib}.so
 		ln -s ${lib}w.pc "$subpkgdir"/usr/lib/pkgconfig/${lib}.pc
 	done
 	# link curses -> ncurses
-	echo "INPUT(-lncursesw)" > "$subpkgdir"/usr/lib/libcursesw.so
-	ln -s libncurses.so "$subpkgdir"/usr/lib/libcurses.so
+	echo "INPUT(-lncursesw)" > "$subpkgdir"/lib/libcursesw.so
+	ln -s libncurses.so "$subpkgdir"/lib/libcurses.so
 }
 
 terminfo() {
@@ -88,8 +89,8 @@ libs() {
 	depends="$pkgname-terminfo-base"
 	provides="ncurses-widec-libs=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	mkdir -p "$subpkgdir"
+	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
 base() {
@@ -100,8 +101,8 @@ base() {
 
 static() {
 	pkgdesc="Static libraries for the ncurses library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/
 }
 
 sha512sums="616975a1ef61ca6efb68c9411fb4d310f5472f4f58c277afaecacc42e2186358dbda1831f8d2f9fe5ef98ecabd8c3ea0e618762450e9cf99b92230277bca480c  ncurses-6.1-20180609.tgz"
-- 
cgit v1.2.3-60-g2f50