diff options
| author | dinoex <dinoex@FreeBSD.org> | 2006-05-25 23:17:34 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2006-05-25 23:17:34 +0800 |
| commit | ce69ab9a0c1b0afb28b48b21d8a220369045e93d (patch) | |
| tree | d8b0aa25aae1b9efaaa3bd2efc1634e80414c1ee /Mk | |
| parent | f8fbe8683ca2bfe25bd4f9902c996daffb546aae (diff) | |
| download | freebsd-ports-gnome-ce69ab9a0c1b0afb28b48b21d8a220369045e93d.tar.gz freebsd-ports-gnome-ce69ab9a0c1b0afb28b48b21d8a220369045e93d.tar.zst freebsd-ports-gnome-ce69ab9a0c1b0afb28b48b21d8a220369045e93d.zip | |
- bump shared lib versions for FreeBSD > 6.0
libssl.o in the base was bumped, but still uses old ABI
KDE crashes, as it does not honor LDFLAGS / -rpath=
- solving regression for OpenOffice users
Reported by: Michel Talon
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.openssl.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index 5b23fc41d741..d187e02643eb 100644 --- a/Mk/bsd.openssl.mk +++ b/Mk/bsd.openssl.mk @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.29 2006-04-30 21:21:11 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.30 2006-05-25 15:17:34 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -105,20 +105,26 @@ OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib OPENSSLBASE= ${LOCALBASE} .if defined(WITH_OPENSSL_BETA) OPENSSL_PORT?= security/openssl-beta +.if ( ${OSVERSION} >= 600100 ) +OPENSSL_SHLIBVER?= 5 +.else OPENSSL_SHLIBVER?= 4 +.endif .elif defined(WITH_OPENSSL_STABLE) OPENSSL_PORT?= security/openssl-stable -OPENSSL_SHLIBVER?= 3 +.if ( ${OSVERSION} >= 600100 ) +OPENSSL_SHLIBVER?= 4 .else -.if !defined(WITHOUT_OPENSSL_097) -.if ( ${OSVERSION} >= 600000 ) && ( ${OSVERSION} < 600100 ) -OPENSSL_PORT?= security/openssl OPENSSL_SHLIBVER?= 3 .endif -.endif +.else OPENSSL_PORT?= security/openssl +.if ( ${OSVERSION} >= 600100 ) +OPENSSL_SHLIBVER?= 5 +.else OPENSSL_SHLIBVER?= 4 .endif +.endif OPENSSLDIR= ${OPENSSLBASE}/openssl |