diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-30 15:21:29 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-30 15:21:29 +0800 |
| commit | 8b4db9d81fcc220bdf44f581386a653d967d59d0 (patch) | |
| tree | eee60a2b75733d80114d8c8751f47f6c7adbcb05 | |
| parent | a2d5e19f0777bc8abe95f8deb1a769ad8b1da00e (diff) | |
| download | marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar.gz marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar.bz2 marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar.lz marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar.xz marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.tar.zst marcuscom-ports-8b4db9d81fcc220bdf44f581386a653d967d59d0.zip | |
Sync with FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3345 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.port.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 2edc3c6b0..969787fa7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -908,7 +908,6 @@ COMM?= /usr/bin/comm CP?= /bin/cp CPIO?= /usr/bin/cpio CUT?= /usr/bin/cut -DATE?= /bin/date DC?= /usr/bin/dc DIALOG?= /usr/bin/dialog DIRNAME?= /usr/bin/dirname @@ -1893,17 +1892,19 @@ EXTRACT_CMD?= ${GZIP_CMD} # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) -.if defined(USE_X_PREFIX) +.if ${PREFIX} == ${X11BASE} .if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif .else -.if ${PREFIX} == /usr +.if ${PREFIX} == ${LOCALBASE} +MTREE_FILE= /etc/mtree/BSD.local.dist +.elif ${PREFIX} == /usr MTREE_FILE= /etc/mtree/BSD.usr.dist .else -MTREE_FILE= /etc/mtree/BSD.local.dist +NO_MTREE= yes # Can't figure out prefix, assume nonstandard .endif .endif .endif @@ -2951,7 +2952,7 @@ check-vulnerable: @if [ -f "${AUDITFILE}" ]; then \ audit_created=`${_EXTRACT_AUDITFILE} | \ ${SED} -nEe "1s/^#CREATED: *([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \ - audit_expiry=`${DATE} -u -v-14d "+%Y%m%d"`; \ + audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \ if [ "$$audit_created" -lt "$$audit_expiry" ]; then \ ${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \ fi; \ |