diff options
| author | dinoex <dinoex@FreeBSD.org> | 2009-01-10 01:04:48 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2009-01-10 01:04:48 +0800 |
| commit | 99197bab3188e82ae42a9aa9f7e89b4a15c94775 (patch) | |
| tree | 94151dd9080596ec698e2f4db18fa5e2cfd182c4 | |
| parent | d85a3861f1de64a4055d23b0e14d3579aec2d219 (diff) | |
| download | freebsd-ports-gnome-99197bab3188e82ae42a9aa9f7e89b4a15c94775.tar.gz freebsd-ports-gnome-99197bab3188e82ae42a9aa9f7e89b4a15c94775.tar.zst freebsd-ports-gnome-99197bab3188e82ae42a9aa9f7e89b4a15c94775.zip | |
- remove WITH_OPENSSL_BETA
| -rw-r--r-- | Mk/bsd.openssl.mk | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index 7e2421b1fd14..af10d9732e06 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.41 2009-01-04 09:42:19 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.42 2009-01-09 17:04:48 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -10,7 +10,6 @@ # # WITH_OPENSSL_BASE=yes - Use the version in the base system. # WITH_OPENSSL_PORT=yes - Use the port, even if base is up to date -# WITH_OPENSSL_BETA=yes - Use a snapshot of recent openssl # # USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS, # needed for ports who don't use LDFLAGS @@ -45,7 +44,6 @@ WITH_OPENSSL_PORT=yes # if no preference was set, check for an installed base version # but give an installed port preference over it. .if !defined(WITH_OPENSSL_BASE) && \ - !defined(WITH_OPENSSL_BETA) && \ !defined(WITH_OPENSSL_PORT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) @@ -97,14 +95,6 @@ OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib .else OPENSSLBASE= ${LOCALBASE} -.if defined(WITH_OPENSSL_BETA) -OPENSSL_PORT?= security/openssl-beta -.if ( ${OSVERSION} >= 600100 ) -OPENSSL_SHLIBVER?= 5 -.else -OPENSSL_SHLIBVER?= 4 -.endif -.else .if !defined(OPENSSL_PORT) && \ exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency @@ -122,13 +112,7 @@ OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} .endif OPENSSL_PORT?= security/openssl -.if ( ${OSVERSION} >= 600100 ) OPENSSL_SHLIBVER?= 5 -.else -OPENSSL_SHLIBVER?= 4 -.endif -.endif - OPENSSLDIR= ${OPENSSLBASE}/openssl BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT} |