diff options
| author | dinoex <dinoex@FreeBSD.org> | 2009-05-07 16:19:02 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2009-05-07 16:19:02 +0800 |
| commit | 1f3e0eb6051c0fcf2be67b5bb7f5776e8c53d4ef (patch) | |
| tree | 269ac2453ad4a7db2338b60eef20fef9fa5e5825 /Mk | |
| parent | 9f2a88be94641dd675b5d3344e1a7958dc739bc5 (diff) | |
| download | freebsd-ports-gnome-1f3e0eb6051c0fcf2be67b5bb7f5776e8c53d4ef.tar.gz freebsd-ports-gnome-1f3e0eb6051c0fcf2be67b5bb7f5776e8c53d4ef.tar.zst freebsd-ports-gnome-1f3e0eb6051c0fcf2be67b5bb7f5776e8c53d4ef.zip | |
- Fix autodetec with invalid PKG_DBDIR
PR: 133927
Submitted by: Eygene Ryabinkin
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.openssl.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index af10d9732e06..ee13eeaac664 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.42 2009-01-09 17:04:48 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.43 2009-05-07 08:19:02 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -107,9 +107,15 @@ OPENSSL_INSTALLED!= find "${PKG_DBDIR}/" -type f -name "+CONTENTS" -print0 | \ if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \ echo "$${contents}"; break; fi; done .endif +.if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} +.else +# PKG_DBDIR was not found, default +OPENSSL_PORT?= security/openssl +OPENSSL_SHLIBVER?= 5 +.endif .endif OPENSSL_PORT?= security/openssl OPENSSL_SHLIBVER?= 5 |