From 605d36542bb051e15b258264bc1c2c7478ba2caf Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Mon, 7 Apr 2003 05:50:39 +0000
Subject: - enable threads on ia64 - OPENSSL_OVERWRITE_BASE   defaults to
 STABLE/CURRENT shared lib version   This solves problems when the share lib
 is deinstalled.   ports/50292 PR:		50292

---
 security/openssl/Makefile              | 12 ++++++------
 security/openssl/files/patch-Configure |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'security/openssl')

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index febd8509f07e..c520d02657c4 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -828,10 +828,10 @@ PLIST_SUB+=	SHARED="@comment "
 .else
 PLIST_SUB+=	SHARED=""
 ALL_TARGET=	freebsd-shared all
-.if exists(/usr/lib/libcrypto.so.3)
-SHLIBVER=	4
-.else
+.if exists(/usr/lib/libcrypto.so.2) && !exists(/usr/lib/libcrypto.so.3)
 SHLIBVER=	3
+.else
+SHLIBVER=	4
 .endif
 MAKE_ENV+=	SHLIBVER=${SHLIBVER}
 PLIST_SUB+=	SHLIBVER=${SHLIBVER}
@@ -841,10 +841,10 @@ INSTALLS_SHLIB=	yes
 .if defined(OPENSSL_OVERWRITE_BASE)
 PKGNAMESUFFIX=	-overwrite-base
 PREFIX=		/usr
-.if exists(/usr/lib/libcrypto.so.3)
-SHLIBVER=	3
-.else
+.if exists(/usr/lib/libcrypto.so.2) && !exists(/usr/lib/libcrypto.so.3)
 SHLIBVER=	2
+.else
+SHLIBVER=	3
 .endif
 OPENSSLDIR=	/etc/ssl
 MANPREFIX=	${PREFIX}/openssl
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index 177fff35cbba..92cedbe6aaa2 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -19,7 +19,7 @@
 -"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 +"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -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)",
-- 
cgit v1.2.3