Add DragonFly support.

4 files changed, 45 insertions, 12 deletions

diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 83ccc2ee95b..4616fa586ba 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.49 2005/12/27 23:40:04 reed Exp $
+$NetBSD: distinfo,v 1.50 2006/06/12 22:46:50 joerg Exp $
 
 SHA1 (openssl-0.9.7i.tar.gz) = 4c23925744d43272fa19615454da44e01465eb06
 RMD160 (openssl-0.9.7i.tar.gz) = 0dce52c5793a0c37f17b620f7d26bbf9e4fcf755
 Size (openssl-0.9.7i.tar.gz) = 3280907 bytes
-SHA1 (patch-aa) = d6cfc26e1f3b378adff1d7f2219ba8e8f39d91e3
-SHA1 (patch-ac) = dc81019f09bb66badb6447b410c70f92b6bd444c
+SHA1 (patch-aa) = f2489178263220535bdc9b6975afee0215bd7cef
+SHA1 (patch-ac) = ee8229a330cb5fcdd31cceaa14f3cadcba4858bf
 SHA1 (patch-ad) = 2581d06c21ed6d1c9a554289591031a6eb66a686
 SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
 SHA1 (patch-af) = e8a9d803d362658e0db3f044b35794b2084b7667
 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
+SHA1 (patch-al) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index db5844b9c61..c40c0aa86e6 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.18 2005/10/11 17:19:21 jlam Exp $
+$NetBSD: patch-aa,v 1.19 2006/06/12 22:46:51 joerg Exp $
 
---- config.orig	2005-04-07 16:26:10.000000000 -0400
+--- config.orig	2005-04-07 20:26:10.000000000 +0000
 +++ config
 @@ -49,6 +49,7 @@ done
  # First get uname entries that we use below
@@ -21,7 +21,16 @@ $NetBSD: patch-aa,v 1.18 2005/10/11 17:19:21 jlam Exp $
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -216,7 +221,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -210,13 +215,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+     FreeBSD:*)
+ 	echo "${MACHINE}-whatever-freebsd"; exit 0
+ 	;;
++    DragonFly:*)
++	echo "${MACHINE}-whatever-dragonfly"; exit 0
++	;;
+ 
+     NetBSD:*:*:*386*)
+         echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
  	;;
  
      NetBSD:*)
@@ -30,9 +39,11 @@ $NetBSD: patch-aa,v 1.18 2005/10/11 17:19:21 jlam Exp $
  	;;
  
      OpenBSD:*)
-@@ -671,9 +676,21 @@ EOF
+@@ -670,10 +678,23 @@ EOF
+   sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
    ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
++  *-dragonfly*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
 -  *86*-*-netbsd) OUT="NetBSD-x86" ;;
 -  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 6aa40cda9ab..da3a6bf4eff 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.29 2005/10/31 14:59:30 tv Exp $
+$NetBSD: patch-ac,v 1.30 2006/06/12 22:46:51 joerg Exp $
 
---- Configure.orig	2005-06-26 13:24:48.000000000 -0400
+--- Configure.orig	2006-06-12 20:46:06.000000000 +0000
 +++ Configure
 @@ -180,7 +180,7 @@ my %table=(
  "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.29 2005/10/31 14:59:30 tv Exp $
  "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  #### SPARC Solaris with GNU C setups
-@@ -412,9 +412,23 @@ my %table=(
+@@ -412,10 +412,25 @@ my %table=(
  "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -36,9 +36,11 @@ $NetBSD: patch-ac,v 1.29 2005/10/31 14:59:30 tv Exp $
 +"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"Interix3","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM /1024*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "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)",
++"DragonFly-i386",  "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)",
-@@ -845,6 +859,10 @@ PROCESS_ARGS:
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+@@ -845,6 +860,10 @@ PROCESS_ARGS:
  				{
  				$libs.=$_." ";
  				}
@@ -49,7 +51,7 @@ $NetBSD: patch-ac,v 1.29 2005/10/31 14:59:30 tv Exp $
  			elsif (/^-[^-]/ or /^\+/)
  				{
  				$flags.=$_." ";
-@@ -1323,7 +1341,7 @@ while (<IN>)
+@@ -1323,7 +1342,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
diff --git a/security/openssl/patches/patch-al b/security/openssl/patches/patch-al
new file mode 100644
index 00000000000..c67d3aca0ab
--- /dev/null
+++ b/security/openssl/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.3 2006/06/12 22:46:51 joerg Exp $
+
+--- apps/speed.c.orig	2006-06-12 22:27:58.000000000 +0000
++++ apps/speed.c
+@@ -89,12 +89,12 @@
+ #include OPENSSL_UNISTD
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) || defined(__DragonFly__)
+ # define USE_TOD
+ #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+ # define TIMES
+ #endif
+-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
++#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__DragonFly__) /* FIXME */
+ # define TIMEB
+ #endif
+