kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Back out introduction of DATE variable in previous commit; it conflicts

Browse source 
with the reasonable use of that variable to hold date strings in the
  environment [1]

* Overhaul the mtree spec file selection code: instead of deciding based
  on the value of USE_X_PREFIX, compare PREFIX to X11BASE and LOCALBASE
  directly.  This fixes the MTREE_FILE for ports that set PREFIX=${X11BASE}
  but don't set USE_X_PREFIX for some reason.  If PREFIX is a
  nonstandard value, set NO_MTREE=yes.

Noticed by:	Jez Hancock <jez.hancock@gmail.com> [1]
This commit is contained in:
Kris Kennaway 2004-12-30 07:14:27 +00:00
parent 9badc0b806
commit d9f3d6b0d0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=125503
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mk/bsd.port.mk
View file

@ -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
@ -1885,17 +1884,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
@ -2943,7 +2944,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; \