diff options
| author | dinoex <dinoex@FreeBSD.org> | 2003-05-07 20:08:00 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2003-05-07 20:08:00 +0000 |
| commit | 9b0a9bd33006f6acb5a1234d0c4c6e0fbc9ab1f0 (patch) | |
| tree | 44fbc07ef064afd6ce6017917d662a343c382e90 | |
| parent | d53a3e842dc0cb2c02b2c48c36520dde3b8f9e31 (diff) | |
| download | FreeBSD-ports-9b0a9bd33006f6acb5a1234d0c4c6e0fbc9ab1f0.zip FreeBSD-ports-9b0a9bd33006f6acb5a1234d0c4c6e0fbc9ab1f0.tar.gz | |
- Fixes problem when base has no openssl installed
Submitted by: marius@alchemy.franken.de
| -rw-r--r-- | Mk/bsd.openssl.mk | 5 | ||||
| -rw-r--r-- | security/openssl/bsd.openssl.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index 6fc881d..0d8d2df 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.4 2003-04-16 14:49:26 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.5 2003-05-07 20:08:00 dinoex Exp $ # # this substitutes USE_OPENSSL=yes # just include this makefile after bsd.ports.pre.mk @@ -40,7 +40,8 @@ WITH_OPENSSL_PORT=yes .if !defined(WITH_OPENSSL_BASE) && \ !defined(WITH_OPENSSL_BETA) && \ !defined(WITH_OPENSSL_PORT) && \ - !exists(${LOCALBASE}/lib/libcrypto.so) + !exists(${LOCALBASE}/lib/libcrypto.so) && \ + exists(/usr/include/openssl/opensslv.h) # Security: version in base must be 0.9.7a OPENSSLVER!= ${AWK} '/OPENSSL_VERSION_NUMBER/ { print $$3 }' \ /usr/include/openssl/opensslv.h diff --git a/security/openssl/bsd.openssl.mk b/security/openssl/bsd.openssl.mk index 8d5c955..795be7b 100644 --- a/security/openssl/bsd.openssl.mk +++ b/security/openssl/bsd.openssl.mk @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: /tmp/pcvs/ports/security/openssl/Attic/bsd.openssl.mk,v 1.4 2003-04-16 14:49:26 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/security/openssl/Attic/bsd.openssl.mk,v 1.5 2003-05-07 20:08:00 dinoex Exp $ # # this substitutes USE_OPENSSL=yes # just include this makefile after bsd.ports.pre.mk @@ -40,7 +40,8 @@ WITH_OPENSSL_PORT=yes .if !defined(WITH_OPENSSL_BASE) && \ !defined(WITH_OPENSSL_BETA) && \ !defined(WITH_OPENSSL_PORT) && \ - !exists(${LOCALBASE}/lib/libcrypto.so) + !exists(${LOCALBASE}/lib/libcrypto.so) && \ + exists(/usr/include/openssl/opensslv.h) # Security: version in base must be 0.9.7a OPENSSLVER!= ${AWK} '/OPENSSL_VERSION_NUMBER/ { print $$3 }' \ /usr/include/openssl/opensslv.h |
