Build on Darwin using patches from Apple's Darwin source repository,

via Fink.

5 files changed, 37 insertions, 11 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 06902ba4c74..fb50d11d908 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2002/07/24 19:45:27 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2002/07/28 05:36:29 schmonz Exp $
 
 DISTNAME=		openssl-0.9.6
 PKGREVISION=		2
@@ -25,7 +25,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-m68k NetBSD-*-mips NetBSD-*-mipseb \
 			NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-powerpc \
 			NetBSD-*-sparc NetBSD-*-vax \
-			SunOS-* Linux-*-*
+			SunOS-* Linux-*-* Darwin-*-*
 
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ARGS=		-fPIC -DPIC --openssldir=${PREFIX} --prefix=${PREFIX} \
diff --git a/security/openssl/PLIST.darwin b/security/openssl/PLIST.darwin
new file mode 100644
index 00000000000..99ed85f2811
--- /dev/null
+++ b/security/openssl/PLIST.darwin
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST.darwin,v 1.1 2002/07/28 05:36:30 schmonz Exp $
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 5d6377deb2e..3f241781551 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2001/09/14 14:17:10 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/07/28 05:36:30 schmonz Exp $
 
 SHA1 (openssl-0.9.6.tar.gz) = d69c964d58535343787a3b8ac38a48772704304c
 Size (openssl-0.9.6.tar.gz) = 2086131 bytes
 SHA1 (openssl-0.9.6-20010914-netbsd.patch.gz) = dc507c58ec4bd0c4aeb7863961b6e3561ca0978f
 Size (openssl-0.9.6-20010914-netbsd.patch.gz) = 2761 bytes
-SHA1 (patch-aa) = c96fb67876b9bd8b5c0c091de209d8f60498126b
+SHA1 (patch-aa) = 967294b914dbaa0f856e619881921a11537b28f0
 SHA1 (patch-ab) = 8d26b010967d2d5d464708baf7bd7672ab064fc3
+SHA1 (patch-ac) = 391d58624890554b9b69ab7c463bf1f40587dccf
 SHA1 (patch-ai) = d0f21b594a3343567f7cbea00e71c5319a877782
 SHA1 (patch-aj) = 157a09410949f85f4a7b0bb878a382c8cd76772c
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index cc3f49486d0..844617fe4eb 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
+$NetBSD: patch-aa,v 1.8 2002/07/28 05:36:30 schmonz Exp $
 
---- config.orig	Thu Sep 21 11:23:14 2000
-+++ config	Sat May 12 00:03:27 2001
-@@ -167,10 +167,14 @@
+--- config.orig	Thu Sep 21 05:23:14 2000
++++ config
+@@ -83,6 +83,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+ 	echo "${MACHINE}-ibm-aix"; exit 0
+ 	;;
+ 
++	Darwin:*)
++	echo "`uname -p`-apple-darwin${RELEASE}"; exit 0
++	;;
++
+     dgux:*)
+ 	echo "${MACHINE}-dg-dgux"; exit 0
+ 	;;
+@@ -167,10 +171,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
          echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
          ;;
  
@@ -20,7 +31,7 @@ $NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
      NetBSD:*)
  	echo "${MACHINE}-whatever-netbsd"; exit 0
  	;;
-@@ -330,6 +334,7 @@
+@@ -330,6 +338,7 @@ else
    CC=cc
  fi
  
@@ -28,7 +39,7 @@ $NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
  if [ "$SYSTEM" = "SunOS" ]; then
    # check for WorkShop C, expected output is "cc: blah-blah C x.x"
    CCVER=`(cc -V 2>&1) 2>/dev/null | \
-@@ -347,6 +352,7 @@
+@@ -347,6 +356,7 @@ if [ "$SYSTEM" = "SunOS" ]; then
      CC=sc3
    fi
  fi
@@ -36,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
  
  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
    # check for Compaq C, expected output is "blah-blah C Vx.x"
-@@ -454,9 +460,9 @@
+@@ -454,9 +464,10 @@ case "$GUESSOS" in
    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
@@ -46,6 +57,7 @@ $NetBSD: patch-aa,v 1.7 2001/05/11 22:14:10 tron Exp $
 +  *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;;
 +  *86-*-netbsd) OUT="NetBSD-i386" ;;
 +  *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
++  *-*-darwin*) OUT="Darwin" ;;
    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
new file mode 100644
index 00000000000..2721ed5687b
--- /dev/null
+++ b/security/openssl/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.4 2002/07/28 05:36:30 schmonz Exp $
+
+--- Configure.orig	Thu Jul 25 20:08:05 2002
++++ Configure
+@@ -404,6 +404,7 @@ my %table=(
+ 
+ ##### MacOS X (a.k.a. Rhapsody) setup
+ "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
++"Darwin","cc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DUSE_TOD::(unknown):::::::::::::darwin-shared:-fno-common:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ 
+ ##### Sony NEWS-OS 4.x
+ "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",