From db54ed8188a778fe4d701dfa5db9ad2a4df65b26 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Fri, 28 Jan 2000 22:05:15 +0000 Subject: [PATCH] Check against ${OSVERSION} instead of the existence of the library files whether openssl should be build or not. --- security/openssl-beta/Makefile | 5 +++-- security/openssl/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index 70eef9eae29c..f3e9c7371517 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -15,7 +15,8 @@ MASTER_SITES= http://www.openssl.org/source/ \ MAINTAINER= dirk@FreeBSD.org -.if exists(/usr/bin/openssl) && exists(/usr/lib/libcrypto.so) && exists(/usr/lib/libssl.so) +.include +.if ${OSVERSION} >= 400014 FORBIDDEN= "OpenSSL is already in the base system" .endif @@ -57,4 +58,4 @@ post-install: .endif @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE -.include +.include diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 70eef9eae29c..f3e9c7371517 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -15,7 +15,8 @@ MASTER_SITES= http://www.openssl.org/source/ \ MAINTAINER= dirk@FreeBSD.org -.if exists(/usr/bin/openssl) && exists(/usr/lib/libcrypto.so) && exists(/usr/lib/libssl.so) +.include +.if ${OSVERSION} >= 400014 FORBIDDEN= "OpenSSL is already in the base system" .endif @@ -57,4 +58,4 @@ post-install: .endif @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE -.include +.include