From ee0b04174011ff11e70d26cd95474564739fd5e1 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Sat, 17 Apr 2010 14:38:13 +0200
Subject: [PATCH] kfreebsdport01: fix openssl build on GNU/kFreeBSD

---
 openssl/makefile.mk      | 14 ++++++++++++--
 openssl/openssllnx.patch | 12 ++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 66bfa31a145e..42d770c95d3f 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -61,15 +61,25 @@ OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
 OUT2INC += include/openssl/*
 
+UNAME=$(shell uname)
+
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
     PATCH_FILES=openssllnx.patch
     ADDITIONAL_FILES:= \
         libcrypto_OOo_0_9_8l.map \
         libssl_OOo_0_9_8l.map
     .IF "$(CPU)" == "I"
-        CONFIGURE_ACTION=Configure linux-elf
+        .IF "$(UNAME)" == "GNU/kFreeBSD"
+            CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+        .ELSE
+            CONFIGURE_ACTION=Configure linux-elf
+        .ENDIF
     .ELIF "$(BUILD64)" == "1"
-        CONFIGURE_ACTION=Configure linux-generic64
+        .IF "$(UNAME)" == "GNU/kFreeBSD"
+            CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
+        .ELSE
+            CONFIGURE_ACTION=Configure linux-generic64
+        .ENDIF
     .ELSE
         CONFIGURE_ACTION=Configure linux-generic32
     .ENDIF
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 2eb929474ae1..7f26b997bd1c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,3 +1,15 @@
+--- misc/build/openssl-0.9.8l/Configure-old	2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8l/Configure	2010-04-17 13:52:03.000000000 +0200
+@@ -382,6 +382,9 @@
+ 
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ 
 --- misc/openssl-0.9.8l/test/Makefile	2009-03-25 11:59:22.000000000 +0100
 +++ misc/build/openssl-0.9.8l/test/Makefile	2009-03-30 12:51:00.210108929 +0200
 @@ -408,7 +408,7 @@