Fix building on FreeBSD and keyword ~x86-fbsd, #104760.

Package-Manager: portage-2.1.3.3

3 files changed, 28 insertions, 14 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 26e0a0eb64a6..2f86028701dc 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.99 2007/04/21 13:19:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.100 2007/08/06 13:32:17 uberlord Exp $
+
+  06 Aug 2007; Roy Marples <uberlord@gentoo.org> pine-4.64-r6.ebuild:
+  Fix building on FreeBSD and keyword ~x86-fbsd, #104760.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> pine-4.64-r5.ebuild:
   ia64 stable
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 692d830e9a89..d9cac150e260 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -64,18 +64,18 @@ EBUILD pine-4.64-r5.ebuild 5551 RMD160 c813a748be261106b0c5f64be3cc7c5580f941d1
 MD5 63f9ccdfdb7884c44a6089199597523e pine-4.64-r5.ebuild 5551
 RMD160 c813a748be261106b0c5f64be3cc7c5580f941d1 pine-4.64-r5.ebuild 5551
 SHA256 02337aae5265925855c0a2a384195ee40522e5c06d8821f79b9cfd13b0b28905 pine-4.64-r5.ebuild 5551
-EBUILD pine-4.64-r6.ebuild 5563 RMD160 ff593666397944a8243a3729922017d4bc7d488d SHA1 41a9d7cd3deb0d253a42b9d76a48a64138b9d17c SHA256 d8833220b1799bf968ed8ae9aef50eb26d55f0c5dc0618a37690793fe1e85b62
-MD5 6825cc94eab8532795597518877738d9 pine-4.64-r6.ebuild 5563
-RMD160 ff593666397944a8243a3729922017d4bc7d488d pine-4.64-r6.ebuild 5563
-SHA256 d8833220b1799bf968ed8ae9aef50eb26d55f0c5dc0618a37690793fe1e85b62 pine-4.64-r6.ebuild 5563
+EBUILD pine-4.64-r6.ebuild 5922 RMD160 32d1ad6f2ff34d9c2cae8af24b0650fbed6227e8 SHA1 f64b0246b07e58b320105d6c5b068ccd36c7fbfe SHA256 53d8018285b289f0274a57daac4d14fd84a78da27281bc9b18ad054891589de5
+MD5 90e3c83f2e54c015688915dce3de443d pine-4.64-r6.ebuild 5922
+RMD160 32d1ad6f2ff34d9c2cae8af24b0650fbed6227e8 pine-4.64-r6.ebuild 5922
+SHA256 53d8018285b289f0274a57daac4d14fd84a78da27281bc9b18ad054891589de5 pine-4.64-r6.ebuild 5922
 EBUILD pine-4.64.ebuild 5547 RMD160 34b2db10e58f1693822fea5bf523f13514ad0330 SHA1 3d1e7ac6e621dc5a1beba0ce667b34d85a825527 SHA256 27be34113c7716234f814690dde5ec752034fc65c03c4f7b296d5b68648f766a
 MD5 b345f861d311ad1d4a3be79ae150a8c9 pine-4.64.ebuild 5547
 RMD160 34b2db10e58f1693822fea5bf523f13514ad0330 pine-4.64.ebuild 5547
 SHA256 27be34113c7716234f814690dde5ec752034fc65c03c4f7b296d5b68648f766a pine-4.64.ebuild 5547
-MISC ChangeLog 22393 RMD160 5729301d8f4306a3c6a49c2895f83991ad0285dc SHA1 f3a195d98f30d0a6e2e41c75f9e4e6f37b47ee0c SHA256 aaa52e44ad86c4d801407b87a8895175f7d9d5072bfe3138f39beb3efe8289f6
-MD5 52b5b897dcb59d1d64e5f8f4c7077676 ChangeLog 22393
-RMD160 5729301d8f4306a3c6a49c2895f83991ad0285dc ChangeLog 22393
-SHA256 aaa52e44ad86c4d801407b87a8895175f7d9d5072bfe3138f39beb3efe8289f6 ChangeLog 22393
+MISC ChangeLog 22524 RMD160 6fd882c47f689f083cc1957161874763ca661dd5 SHA1 4d373cb680723e968c556829b1c4e9d69ab8b079 SHA256 ec6caaeb2263d1f387683065a76ea50e0a001c069b80724e6a2b1a8cce0104f5
+MD5 b7c58c68439ae03e306e9ff683c53bfe ChangeLog 22524
+RMD160 6fd882c47f689f083cc1957161874763ca661dd5 ChangeLog 22524
+SHA256 ec6caaeb2263d1f387683065a76ea50e0a001c069b80724e6a2b1a8cce0104f5 ChangeLog 22524
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
diff --git a/mail-client/pine/pine-4.64-r6.ebuild b/mail-client/pine/pine-4.64-r6.ebuild
index bda21e671f07..799af21fd6bd 100644
--- a/mail-client/pine/pine-4.64-r6.ebuild
+++ b/mail-client/pine/pine-4.64-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.4 2007/06/26 02:08:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.5 2007/08/06 13:32:17 uberlord Exp $
 
 inherit eutils
 
@@ -21,13 +21,13 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
 
 LICENSE="PICO"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="ssl ldap kerberos largeterminal pam passfile debug"
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
+	pam? ( virtual/pam )
 	ssl? ( dev-libs/openssl )
 	ldap? ( net-nds/openldap )
 	kerberos? ( app-crypt/mit-krb5 )"
@@ -118,6 +118,15 @@ src_unpack() {
 
 	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
 		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
+
+	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		-i "${S}/pine/osdep/os-bsf.h" || die "sed os-bsf.h failed"
+
+	# We use ncurses for FreeBSD
+	for x in "${S}"/*/makefile.bsf ; do
+		sed -e "s/-ltermcap/-lcurses/g" -e "s/-ltermlib/-lcurses/g" \
+			-i "${x}" || die "sed ${x} failed"
+	done
 }
 
 src_compile() {
@@ -126,7 +135,7 @@ src_compile() {
 		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
 		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
 			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
+			-e "s:-I\$(SSLINCLUDE):-I/usr/include/openssl:" \
 			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
 	else
 		myconf="${myconf} NOSSL"
@@ -141,7 +150,9 @@ src_compile() {
 		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
 	fi
 
-	if use pam ; then
+	if use elibc_FreeBSD ; then
+		target=bsf
+	elif use pam ; then
 		target=lnp
 	else
 		target=slx