Fixed the gentoo.config script to be aware of different OS (in this case, FreeBSD), and added an output to tell which target is selected.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 91 insertions, 76 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 48ec48a5ba8f..95df324ca9a7 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.120 2005/05/30 02:34:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.121 2005/06/13 12:05:45 flameeyes Exp $
+
+  13 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/gentoo.config-0.9.7g, openssl-0.9.7g.ebuild:
+  Fixed the gentoo.config script to be aware of different OS (in this case,
+  FreeBSD), and added an output to tell which target is selected.
 
   29 May 2005; <solar@gentoo.org> openssl-0.9.7d-r2.ebuild,
   openssl-0.9.7e.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f3955c24423b..e016eabbea9a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,46 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 44e73d88e69d04a7c6b0e02639e3c384 ChangeLog 19257
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
+MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
 MD5 5b33d1f91cb7d90e4d0d125905b8dfbb openssl-0.9.7d-r2.ebuild 8970
 MD5 aa6f82913db25a660c1e472864f6920d openssl-0.9.7e-r1.ebuild 8518
 MD5 b006190dcd671619b4028aa5ad2e994c openssl-0.9.7e.ebuild 7842
-MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
-MD5 a2f79bac9c7cfbcb0c4d266929270248 ChangeLog 19004
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 3ef25ed5c6d7dd2cdc7a89a15fb86814 openssl-0.9.7g.ebuild 5135
-MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
-MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
-MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
-MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
-MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
-MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
-MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
-MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
+MD5 0d2217720540cbf67914a930abf66364 openssl-0.9.7g.ebuild 5177
+MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
-MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
-MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
-MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
-MD5 517bf0eabf8990cf6297985b2e2c814e files/gentoo.config-0.9.7g 1939
-MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
-MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
 MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134
+MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134
+MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
+MD5 0a4e4848787cfb664d90dfda89a76211 files/gentoo.config-0.9.7g 2243
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
 MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
+MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
 MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
+MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
+MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
+MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
+MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
+MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
+MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
+MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
 MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333
-MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
+MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iQCVAwUBQpp7v54WFLgrx1GWAQJTPQP/VpyWgbImDZNHJtDkBBGgQ9B5Ie9pUaeK
-AMDk7cV4mpZ/rFb1KfmMwbeV4mujB6BtWt2k4sb6MR4GAnlzixO8t4xDH4CGwAp2
-jFa/LvdbQTBTW0hm+J+B7fTxnqzIo8g/akweDWG/WyZvxqqMb65XEboCdnh0W6XE
-6jOj4Bce7WY=
-=kRPl
+iD8DBQFCrXa1j5H05b2HAEkRAhu2AKCHSoJLTjfntozDJt6F87dEA/KtNQCfYxQz
+Dh60jNBI6Thcb9SL6CeCz1Y=
+=r0a/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.7g b/dev-libs/openssl/files/gentoo.config-0.9.7g
index abb743551f48..a1c43aad83f8 100755
--- a/dev-libs/openssl/files/gentoo.config-0.9.7g
+++ b/dev-libs/openssl/files/gentoo.config-0.9.7g
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.2 2005/05/14 17:37:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.3 2005/06/13 12:05:45 flameeyes Exp $
 
 # Openssl doesn't play along nicely with cross-compiling 
 # like autotools based projects, so let's teach it new tricks.
@@ -10,55 +10,65 @@
 # we can pass to the 'Configure' script.
 
 
-system="linux"
-#case ${CHOST##*-}
-#	uclibc*)  system="linux"
-#	gnu*)     system="linux"
-#esac
+case ${CHOST} in
+	*-uclibc-*)  system="linux";;
+	*-gnu*)      system="linux";;
+	*-freebsd*)  system="FreeBSD";;
+esac
 
 compiler="gcc"
 if [[ ${CC} == "ccc" ]] ; then
 	compiler=${CC}
 fi
 
-machine=""
-case ${CHOST%%-*} in
-	alphaev56*)   machine=alpha+bwx-${compiler};;
-	alphaev[67]*) machine=alpha+bwx-${compiler};;
-	alpha*)
-		# this pretty hack is because we have to make sure we
-		# maintain ABI on the system or things like ssh break
-		currmachine=""
-		if [[ ${ROOT} == "/" ]] && [[ -e /usr/lib/libcrypto.so ]] ; then
-			currmachine=$(strings /usr/lib/libcrypto.so | grep ^linux-alpha | sed -e s:linux-::)
-		fi
-		machine=${currmachine:-alpha-${compiler}}
-
-		# NOTE: drop this crap next time SSL changes ABI #'s
-		[[ ${PV:0:5} != "0.9.7" ]] && machine="plzupdatemekthxbye"
-		;;
-
-	arm*eb*)      machine="elf-arm -DB_ENDIAN";;
-	arm*)         machine="elf-arm -DL_ENDIAN";;
-#	hppa64*)      machine=parisc64;;
-	hppa*)        machine=parisc;;
-	i[0-5]86*)    machine=elf;;
-	i[6-9]86*)    machine=pentium;;
-	ia64*)        machine=ia64;;
-	m68*)         machine=m68k;;
-	mips*el*)     machine=mipsel;;
-	mips*)        machine=mips;;
-	powerpc64*)   machine=ppc64;;
-	powerpc*)     machine=ppc;;
-	sh64*)        machine=elf;;
-	sh*)          machine=elf;;
-	sparc*v7*)    machine=sparcv7;;
-	sparc64*)     machine=sparcv9;;
-	sparc*)       machine=sparcv8;;
-	s390x*)       machine=s390x;;
-	s390*)        machine=s390;;
-	x86_64*)      machine=x86_64;;
-esac
+if [[ ${system} == "linux" ]]; then
+	machine=""
+	case ${CHOST} in
+		alphaev56*)   machine=alpha+bwx-${compiler};;
+		alphaev[67]*) machine=alpha+bwx-${compiler};;
+		alpha*)
+			# this pretty hack is because we have to make sure we
+			# maintain ABI on the system or things like ssh break
+			currmachine=""
+			if [[ ${ROOT} == "/" ]] && [[ -e /usr/lib/libcrypto.so ]] ; then
+				currmachine=$(strings /usr/lib/libcrypto.so | grep ^linux-alpha | sed -e s:linux-::)
+			fi
+			machine=${currmachine:-alpha-${compiler}}
+	
+			# NOTE: drop this crap next time SSL changes ABI #'s
+			[[ ${PV:0:5} != "0.9.7" ]] && machine="plzupdatemekthxbye"
+			;;
+	
+		arm*eb*)      machine="elf-arm -DB_ENDIAN";;
+		arm*)         machine="elf-arm -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine=parisc;;
+		i[0-5]86*)    machine=elf;;
+		i[6-9]86*)    machine=pentium;;
+		ia64*)        machine=ia64;;
+		m68*)         machine=m68k;;
+		mips*el*)     machine=mipsel;;
+		mips*)        machine=mips;;
+		powerpc64*)   machine=ppc64;;
+		powerpc*)     machine=ppc;;
+		sh64*)        machine=elf;;
+		sh*)          machine=elf;;
+		sparc*v7*)    machine=sparcv7;;
+		sparc64*)     machine=sparcv9;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x;;
+		s390*)        machine=s390;;
+		x86_64*)      machine=x86_64;;
+	esac
+elif [[ "${system}" == "FreeBSD" ]]; then
+	machine=""
+	case ${CHOST} in
+		sparc64*)     machine=sparc64;;
+		ia64*)        machine=ia64;;
+		alpha*)       machine=alpha;;
+		*)            machine=elf;;
+	esac
+fi
 
 if [ -n "${machine}" ] ; then
 	echo ${system}-${machine}
diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild
index ac8cca420a97..84ed5ab35c1a 100644
--- a/dev-libs/openssl/openssl-0.9.7g.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7g.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/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.9 2005/05/22 09:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.10 2005/06/13 12:05:45 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -86,6 +86,8 @@ src_compile() {
 	use bindist && confopts="no-idea no-rc5 no-mdc2 -no-ec"
 
 	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout}"
+
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
 	./${config} \