aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2003-02-01 03:54:56 +0800
committerdinoex <dinoex@FreeBSD.org>2003-02-01 03:54:56 +0800
commit3cbd40596a552330f59d0dcfc11ec33e75269c4d (patch)
treedc9cf00ffff2f39f71282d9951384bdd83e43cef
parent7059b15a82a3eb188d2bc1a040d4af21891944f0 (diff)
downloadfreebsd-ports-gnome-3cbd40596a552330f59d0dcfc11ec33e75269c4d.tar.gz
freebsd-ports-gnome-3cbd40596a552330f59d0dcfc11ec33e75269c4d.tar.zst
freebsd-ports-gnome-3cbd40596a552330f59d0dcfc11ec33e75269c4d.zip
- Fix CURRENT version bump in openssl, so ports link as expected.
-rw-r--r--security/openssl-beta/Makefile5
-rw-r--r--security/openssl/Makefile5
-rw-r--r--security/openssl/Makefile.ssl10
3 files changed, 18 insertions, 2 deletions
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index e15c2df6a90c..3abdf091cde9 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openssl
PORTVERSION= 0.9.7
+PORTREVISION= 1
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/source/ \
ftp://ftp.openssl.org/source/ \
@@ -34,7 +35,11 @@ PLIST_SUB+= SHARED="@comment "
.else
PLIST_SUB+= SHARED=""
ALL_TARGET= freebsd-shared all
+.if exists(/usr/lib/libcrypto.so.3)
+SHLIBVER= 4
+.else
SHLIBVER= 3
+.endif
MAKE_ENV+= SHLIBVER=${SHLIBVER}
PLIST_SUB+= SHLIBVER=${SHLIBVER}
INSTALLS_SHLIB= yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index bd32e14f5202..d1c08533b55f 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openssl
PORTVERSION= 0.9.7
+PORTREVISION= 1
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/source/ \
ftp://ftp.openssl.org/source/ \
@@ -33,7 +34,11 @@ PLIST_SUB+= SHARED="@comment "
.else
PLIST_SUB+= SHARED=""
ALL_TARGET= freebsd-shared all
+.if exists(/usr/lib/libcrypto.so.3)
+SHLIBVER= 4
+.else
SHLIBVER= 3
+.endif
MAKE_ENV+= SHLIBVER=${SHLIBVER}
PLIST_SUB+= SHLIBVER=${SHLIBVER}
INSTALLS_SHLIB= yes
diff --git a/security/openssl/Makefile.ssl b/security/openssl/Makefile.ssl
index fa775e034068..11d7db7fc28f 100644
--- a/security/openssl/Makefile.ssl
+++ b/security/openssl/Makefile.ssl
@@ -48,13 +48,19 @@ MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
.else
+.if exists(/usr/lib/libcrypto.so.3)
+SHLIBVER= 4
+.else
+SHLIBVER= 3
+.endif
+
OPENSSLBASE= ${LOCALBASE}
.if defined(USE_OPENSSL_BETA)
OPENSSLDIR= ${OPENSSLBASE}/openssl
-LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl-beta
+LIB_DEPENDS+= crypto.${SHLIBVER}:${PORTSDIR}/security/openssl-beta
.else
OPENSSLDIR= ${OPENSSLBASE}/openssl
-LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl
+LIB_DEPENDS+= crypto.${SHLIBVER}:${PORTSDIR}/security/openssl
.endif
.endif