diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8f7a3b9..d588711 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: head/Mk/bsd.port.mk 316786 2013-04-29 08:57:12Z bapt $ +# $FreeBSD: head/Mk/bsd.port.mk 317115 2013-05-02 14:07:31Z bapt $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1143,6 +1143,11 @@ INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses +# make sure bmake treats -V as expected +.MAKE.EXPAND_VARIABLES= yes +# tell bmake we use the old :L :U modifiers +.MAKE.FreeBSD_UL= yes + .include "${PORTSDIR}/Mk/bsd.commands.mk" # @@ -1211,7 +1216,7 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .if ${OSVERSION} >= 1000017 .if !defined(WITHOUT_PKGNG) -WITH_PKGNG= yes +WITH_PKGNG?= yes .else .undef WITH_PKGNG .endif @@ -2803,18 +2808,12 @@ patch-sites: patch-sites-DEFAULT .if defined(IGNOREFILES) .if !defined(CKSUMFILES) -CKSUMFILES!= \ - for file in ${ALLFILES}; do \ - ignore=0; \ - for tmp in ${IGNOREFILES}; do \ - if [ "$$file" = "$$tmp" ]; then \ - ignore=1; \ - fi; \ - done; \ - if [ "$$ignore" = 0 ]; then \ - ${ECHO_CMD} "$$file"; \ - fi; \ - done +. for _f in ${ALLFILES} +. if ! ${IGNOREFILES:M${_f}} +CKSUMFILES+= ${_f} +. endif +. endfor +. undef _f .endif .else CKSUMFILES= ${ALLFILES} @@ -2962,6 +2961,11 @@ MANEXT= .gz .endif .if (defined(MLINKS) || defined(_MLINKS_PREPEND)) && !defined(_MLINKS) + +.if defined(.PARSEDIR) +_MLINKS= ${_MLINKS_PREPEND} \ + ${MANLANG:S,^,man/,:S,/"",,:@m@${MLINKS:@p@${MAN${p:E}PREFIX}/$m/man${p:E}/$p${MANEXT}@}@} +.else __pmlinks!= ${ECHO_CMD} '${MLINKS:S/ / /}' | ${AWK} \ '{ if (NF % 2 != 0) { print "broken"; exit; } \ for (i=1; i<=NF; i++) { \ @@ -2988,6 +2992,7 @@ _MLINKS+= ${___pmlinks:S// /g} .endfor .endfor .endif +.endif _COUNT=0 .for ___tpmlinks in ${_MLINKS} .if ${_COUNT} == "1" |