diff options
| author | fredb <fredb> | 2002-08-04 23:38:43 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-08-04 23:38:43 +0000 |
| commit | 33adc7f22ea4c3f8b23a444084da45030995448b (patch) | |
| tree | 99e36d9ee62e58153cb04b4eaa9e11a841ac840c | |
| parent | 1ead7421dc2813ecd4549773128a63c2cfc354e8 (diff) | |
| download | pkgsrc-33adc7f22ea4c3f8b23a444084da45030995448b.tar.gz | |
Make this work on platforms that don't have any base system "openssl",
includes (i.e NetBSD-1.4.3). Problem pointed out by Amitai Schlair.
| -rw-r--r-- | security/openssl/buildlink.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk index 93d8a7ea3d8..7a9343d65f3 100644 --- a/security/openssl/buildlink.mk +++ b/security/openssl/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.14 2002/08/04 15:47:44 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.15 2002/08/04 23:38:43 fredb Exp $ # # This Makefile fragment is included by packages that use OpenSSL. # @@ -30,8 +30,6 @@ OPENSSL_VERSION_096E= 0x0090605fL # If a usable version isn't present, then use the pkgsrc OpenSSL package. # .include "../../mk/bsd.prefs.mk" -_NEED_OPENSSL= YES - .if ${OPSYS} == "Darwin" _OPENSSLV_H= /usr/local/include/openssl/opensslv.h _SSL_H= /usr/local/include/openssl/ssl.h @@ -40,6 +38,7 @@ _OPENSSLV_H= /usr/include/openssl/opensslv.h _SSL_H= /usr/include/openssl/ssl.h .endif +_NEED_OPENSSL= YES .if exists(${_OPENSSLV_H}) && exists(${_SSL_H}) _IN_TREE_OPENSSL_HAS_FIX!= \ ${AWK} 'BEGIN { ans = "NO" } \ @@ -52,11 +51,6 @@ USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_095A} USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096E} . endif -# Associate OpenSSL dependency with version number. -. if defined(USE_OPENSSL_VERSION) -BUILDLINK_DEPENDS.openssl= openssl>=0.9.6e -. endif - _OPENSSL_VERSION!= ${AWK} '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \ ${_OPENSSLV_H} @@ -100,6 +94,11 @@ _NEED_OPENSSL= NO .endif # exists(${_OPENSSLV_H}) && exists(${_SSL_H}) +# Here is where we associate the OpenSSL dependency with version number, +# conditionally on ${USE_OPENSSL_VERSION}, but for now, there is only one +# version permitted. +BUILDLINK_DEPENDS.openssl= openssl>=0.9.6e + .if ${_NEED_OPENSSL} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.openssl}:../../security/openssl EVAL_PREFIX+= BUILDLINK_PREFIX.openssl=openssl |