sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix autodetec with invalid PKG_DBDIR

Browse source 
PR:		133927
Submitted by:	Eygene Ryabinkin
This commit is contained in:
Dirk Meyer 2009-05-07 08:19:02 +00:00
parent 664cbfb2ca
commit ae6b3b9b60
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=233353
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mk/bsd.openssl.mk
View file

@ -2,7 +2,7 @@
# Date created: 31 May 2002 # Date created: 31 May 2002
# Whom: dinoex # 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 # 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 \ if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \
echo "$${contents}"; break; fi; done echo "$${contents}"; break; fi; done
.endif .endif
.if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2
OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}"
OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E}
.else
# PKG_DBDIR was not found, default
OPENSSL_PORT?= security/openssl
OPENSSL_SHLIBVER?= 5
.endif
.endif .endif
OPENSSL_PORT?= security/openssl OPENSSL_PORT?= security/openssl
OPENSSL_SHLIBVER?= 5 OPENSSL_SHLIBVER?= 5