Install libraries into /usr/lib on Darwin #92018.

Package-Manager: portage-2.0.51.21-r1

3 files changed, 26 insertions, 27 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index b6f19e3def1c..046c2b39651c 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.94 2005/05/01 17:17:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.95 2005/05/10 01:01:15 vapier Exp $
+
+  10 May 2005; Mike Frysinger <vapier@gentoo.org>
+  ncurses-5.4.20050319.ebuild:
+  Install libraries into /usr/lib on Darwin #92018.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ncurses-5.4-r6.ebuild:
   Stable on ppc.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index aa3aef8af5c0..d9579892f2ce 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 05ff20e1e287685ef67f96800cdc3c6e ncurses-5.4-r6.ebuild 5378
-MD5 3c4a01d7c3fad3e3ebc9bd7bf298ee5b ncurses-5.4-r5.ebuild 6140
-MD5 dc48a525d519adf819d098b754d27d0a ChangeLog 14851
+MD5 845bf448101a1db430c62686ac93e156 ChangeLog 14985
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 026ecb9d396eb49bb02f2e752d6e4688 ncurses-5.4.20050319.ebuild 5595
+MD5 3c4a01d7c3fad3e3ebc9bd7bf298ee5b ncurses-5.4-r5.ebuild 6140
+MD5 05ff20e1e287685ef67f96800cdc3c6e ncurses-5.4-r6.ebuild 5378
+MD5 e4d4476cf79d7e35d44a6a7f71a1fb82 ncurses-5.4.20050319.ebuild 5733
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
 MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142
-MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
-MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeEs8I1lqEGTUzyQRAmMCAJ48/bng46OreRvnGy34XkQW9GZUswCeMrKn
-gmPD29e9kZk++B1kJ8WkKZU=
-=k2wJ
------END PGP SIGNATURE-----
+MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
diff --git a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
index 5e8d47448201..7c05f8339ff5 100644
--- a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.2 2005/05/03 04:48:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.3 2005/05/10 01:01:15 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -65,11 +65,14 @@ src_compile() {
 do_compile() {
 	ECONF_SOURCE=${S}
 
+	local mylibprefix=""
+	[[ ${USERLAND} == "Darwin" ]] && mylibprefix="/usr"
+
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	econf \
-		--libdir=/$(get_libdir) \
+		--libdir=${mylibprefix}/$(get_libdir) \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -102,12 +105,14 @@ src_install() {
 	cd "${WORKDIR}"/narrowc
 	make DESTDIR="${D}" install || die "make narrowc install failed"
 
-	# Move static and extraneous ncurses libraries out of /lib
-	dodir /usr/$(get_libdir)
-	cd "${D}"/$(get_libdir)
-	mv libform* libmenu* libpanel* *.a "${D}"/usr/$(get_libdir)/
-	gen_usr_ldscript lib{,n}curses.so
-	use unicode && gen_usr_ldscript lib{,n}cursesw.so
+	if [[ ${USERLAND} != "Darwin" ]] ; then
+		# Move static and extraneous ncurses libraries out of /lib
+		dodir /usr/$(get_libdir)
+		cd "${D}"/$(get_libdir)
+		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}curses.so
+		use unicode && gen_usr_ldscript lib{,n}cursesw.so
+	fi
 
 	# We need the basic terminfo files in /etc, bug #37026
 	einfo "Installing basic terminfo files in /etc..."