diff options
| author | gabor <gabor@FreeBSD.org> | 2007-08-04 19:37:24 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2007-08-04 19:37:24 +0800 |
| commit | fb4c30cf2c9bc123dc0c05a0e070f2c48e83be57 (patch) | |
| tree | a3e0091d15ba1075a2c1062f7df70c899725f2a9 /Mk/bsd.openssl.mk | |
| parent | 1245245386f7ff318e0531e6bd7ec16b00d44656 (diff) | |
| download | freebsd-ports-graphics-fb4c30cf2c9bc123dc0c05a0e070f2c48e83be57.tar.gz freebsd-ports-graphics-fb4c30cf2c9bc123dc0c05a0e070f2c48e83be57.tar.zst freebsd-ports-graphics-fb4c30cf2c9bc123dc0c05a0e070f2c48e83be57.zip | |
- Extract command variable definitions from bsd.port.mk, they are now stored in
bsd.commands.mk and can be easily reused within the infrastructure.
- Revert old DESTDIR implementation.
- Add a new, fully chrooted DESTDIR implementation as bsd.destdir.mk.
Sponsored by: Google Summer of Code 2007
Approved by: portmgr (pav)
Diffstat (limited to 'Mk/bsd.openssl.mk')
| -rw-r--r-- | Mk/bsd.openssl.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk index fae22dc61ee..6640e4df0fb 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.34 2006-10-08 09:38:38 dinoex Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.35 2007-08-04 11:37:23 gabor Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -59,10 +59,10 @@ WITH_OPENSSL_BASE=yes .endif .if defined(WITH_OPENSSL_BASE) -OPENSSLBASE= ${DESTDIR}/usr -OPENSSLDIR= ${DESTDIR}/etc/ssl +OPENSSLBASE= /usr +OPENSSLDIR= /etc/ssl -.if !exists(${DESTDIR}/usr/lib/libcrypto.so) +.if !exists(/usr/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of" @${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your" @@ -98,7 +98,7 @@ OPENSSL_CFLAGS+= -DNO_IDEA .endif MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" .endif -OPENSSLRPATH= ${DESTDIR}/usr/lib:${LOCALBASE}/lib +OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib .else @@ -121,11 +121,11 @@ OPENSSL_SHLIBVER?= 3 .if !defined(OPENSSL_PORT) && \ exists(${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency -PKG_DBDIR?= ${DESTDIR}/var/db/pkg +PKG_DBDIR?= /var/db/pkg 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_REL}" ; then \ + if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \ echo "$${contents}"; break; fi; done OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" |