diff options
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index eee8bfb7c45f..eb71d0f7f7f8 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -113,7 +113,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: not set. # PATCH_SITES - Primary location(s) for distribution patch files # if not found locally. -# DIST_SUBDIR - Suffix to ${DISTDIR}. If set, all ${DISTFILES} and +# DIST_SUBDIR - Suffix to ${DISTDIR}. If set to non-empty value, all ${DISTFILES} and # ${PATCHFILES} will be put in this subdirectory of # ${DISTDIR} (see below). Also they will be fetched in this # subdirectory from FreeBSD mirror sites. @@ -1007,7 +1007,7 @@ PORTSDIR?= /usr/ports LOCALBASE?= /usr/local LINUXBASE?= /compat/linux DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}${DIST_SUBDIR:D/${DIST_SUBDIR}} +_DISTDIR?= ${DISTDIR}${empty(DIST_SUBDIR):?:${DIST_SUBDIR:D/${DIST_SUBDIR}}} INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses @@ -1386,7 +1386,7 @@ PREFIX?= ${LOCALBASE} PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg . if defined(USE_LOCAL_MK) -.include "${PORTSDIR}/Mk/bsd.local.mk" +.sinclude "${PORTSDIR}/Mk/bsd.local.mk" . endif . for odir in ${OVERLAYS} .sinclude "${odir}/Mk/bsd.overlay.mk" @@ -1773,6 +1773,7 @@ CFLAGS:= ${CFLAGS:C/ $//} . if defined(_CPUCFLAGS) . if !empty(_CPUCFLAGS) CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} +CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//} . endif . endif . endif @@ -1935,7 +1936,7 @@ PKGPREDEINSTALL?= ${PKGDIR}/pkg-pre-deinstall PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall . if defined(USE_LOCAL_MK) -.include "${PORTSDIR}/Mk/bsd.local.mk" +.sinclude "${PORTSDIR}/Mk/bsd.local.mk" . endif . for odir in ${OVERLAYS} .sinclude "${odir}/Mk/bsd.overlay.mk" @@ -2543,7 +2544,7 @@ _PATCH_SITES_ENV+= _PATCH_SITES_${_group}=${_PATCH_SITES_${_group}:Q} CKSUMFILES= ${ALLFILES} # List of all files, with ${DIST_SUBDIR} in front. Used for checksum. -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) . if defined(CKSUMFILES) && ${CKSUMFILES}!="" _CKSUMFILES?= ${CKSUMFILES:S/^/${DIST_SUBDIR}\//} . endif @@ -3909,7 +3910,7 @@ delete-distfiles: fi; \ done; \ fi) -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) -@${RMDIR} ${_DISTDIR} >/dev/null 2>&1 || ${TRUE} . endif . endif @@ -3926,7 +3927,7 @@ delete-distfiles-list: fi; \ done; \ fi -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) @${ECHO_CMD} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}" . endif . endif @@ -5330,7 +5331,9 @@ show-warnings: @${ECHO_MSG} "${m}" | ${FMT_80} @${ECHO_MSG} . endfor +. if ${WARNING_WAIT} != 0 @sleep ${WARNING_WAIT} +. endif . endif . if defined(ERROR) @@ -5356,7 +5359,7 @@ show-dev-warnings: . endfor . if defined(DEV_WARNING_FATAL) @${FALSE} -. else +. elif ${DEV_WARNING_WAIT} != 0 @sleep ${DEV_WARNING_WAIT} . endif . endif |