Added patch to support amd64-fbsd target. Updated config script.

(Portage version: 2.0.51.22)

4 files changed, 22 insertions, 3 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 7dc28ca6cd96..f7a80b61a712 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.133 2005/08/12 17:53:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.134 2005/08/13 14:20:47 flameeyes Exp $
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/gentoo.config-0.9.7g, +files/openssl-0.9.7g-amd64-fbsd.patch,
+  openssl-0.9.7g.ebuild:
+  Added patch to support amd64-fbsd target. Updated config script.
 
   12 Aug 2005; <stkn@gentoo.org> +files/openssl-0.9.7c-tempfile.patch:
   Readding missing patch.
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.7g b/dev-libs/openssl/files/gentoo.config-0.9.7g
index 173abe03e189..b7659bd969e3 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.9 2005/08/07 12:21:57 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.10 2005/08/13 14:20:47 flameeyes Exp $
 #
 # Openssl doesn't play along nicely with cross-compiling 
 # like autotools based projects, so let's teach it new tricks.
@@ -20,6 +20,7 @@ if [[ $1 == "test" ]] ; then
 		"whatever-gentoo-freebsdX.Y   |FreeBSD-elf" \
 		"sparc64-alpha-freebsdX.Y     |FreeBSD-sparc64" \
 		"ia64-gentoo-freebsd5.99234   |FreeBSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |FreeBSD-amd64" \
 		"hppa64-aldsF-linux-gnu5.3    |linux-parisc" \
 		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
 		"powerpc64-unk-linux-gnu      |linux-ppc64" \
@@ -104,6 +105,7 @@ FreeBSD)
 		sparc64*)     machine=sparc64;;
 		ia64*)        machine=ia64;;
 		alpha*)       machine=alpha;;
+		x86_64*)      machine=amd64;;
 		*)            machine=elf;;
 	esac
 	;;
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch b/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
new file mode 100644
index 000000000000..a073e00326ac
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
@@ -0,0 +1,11 @@
+diff -ur -x '*~' openssl-0.9.7g/Configure openssl-0.9.7g-gfbsd-amd64/Configure
+--- openssl-0.9.7g/Configure	2005-04-07 18:06:01.000000000 +0200
++++ openssl-0.9.7g-gfbsd-amd64/Configure	2005-08-11 16:23:42.000000000 +0200
+@@ -419,6 +419,7 @@
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-amd64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild
index eefb2e307203..9f94fc04de8c 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.15 2005/08/11 04:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.16 2005/08/13 14:20:47 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -34,6 +34,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.9.7g-mem-clr-ptr-cast.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7g-ABI-compat.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7g-superh.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-amd64-fbsd.patch
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"