mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

- remove OPENSSL_OVERWRITE_BASE

Browse Source 
Suggestet by:	tmclaugh

- ignore returncode from grep to be kind to portmaster
This commit is contained in:
Dirk Meyer 2008-03-30 11:36:47 +00:00
parent d366498bc9
commit 2d78d2b61d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=210164
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mk/bsd.openssl.mk
View File

@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.36 2007-08-06 10:39:24 dinoex Exp $
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.37 2008-03-30 11:36:47 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@ -52,9 +52,8 @@ WITH_OPENSSL_STABLE=yes
!defined(WITH_OPENSSL_BETA) && \
!defined(WITH_OPENSSL_PORT) && \
!defined(WITH_OPENSSL_STABLE) && \
!defined(OPENSSL_OVERWRITE_BASE) && \
!exists(${LOCALBASE}/lib/libcrypto.so) && \
exists(/usr/include/openssl/opensslv.h)
!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
exists(${DESTDIR}/usr/include/openssl/opensslv.h)
WITH_OPENSSL_BASE=yes
.endif
@ -119,10 +118,10 @@ OPENSSL_SHLIBVER?= 3
.endif
.else
.if !defined(OPENSSL_PORT) && \
exists(${LOCALBASE}/lib/libcrypto.so)
exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
PKG_DBDIR?= ${DESTDIR}/var/db/pkg
OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \
OPENSSL_INSTALLED!= -grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \
while read contents; do \
sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \