[Midnightbsd-cvs] mports [20608] trunk/Mk/bsd.mport.mk: try deleting these crazy soft depends
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 31 16:43:50 EDT 2015
Revision: 20608
http://svnweb.midnightbsd.org/mports/?rev=20608
Author: laffer1
Date: 2015-10-31 16:43:27 -0400 (Sat, 31 Oct 2015)
Log Message:
-----------
try deleting these crazy soft depends
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2015-10-31 20:21:30 UTC (rev 20607)
+++ trunk/Mk/bsd.mport.mk 2015-10-31 20:43:27 UTC (rev 20608)
@@ -1404,7 +1404,7 @@
. if !empty(_S_TEMP)
. for _group in ${_S_TEMP:S/^://:S/,/ /g}
. if !target(master-sites-${_group})
-SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-${_group}
+SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group}
master-sites-${_group}:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
. endif
@@ -1416,7 +1416,7 @@
. if !empty(_S_TEMP)
. for _group in ${_S_TEMP:S/^://:S/,/ /g}
. if !target(patch-sites-${_group})
-SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group}
+SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group}
patch-sites-${_group}:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
. endif
@@ -2539,7 +2539,7 @@
! ${AWK} -v audit="$${PORTS_AUDIT}" -v destdir="${DESTDIR}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \
${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \
then \
- www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
+ www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \
if [ ! -z "$${www_site}" ]; then \
${ECHO_MSG}; \
${ECHO_MSG} " For more information, and contact details about the security"; \
@@ -2772,19 +2772,19 @@
.if ${UID} != 0 && defined(_${target:tu}_SUSEQ) && !defined(INSTALL_AS_USER)
.if defined(USE_SUBMAKE)
${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
- @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SEQ}
+ @cd ${.CURDIR} && ${MAKE} ${_${target:tu}_SEQ}
.else
${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_SEQ}
.endif
@${ECHO_MSG} "===> Switching to root credentials for '${target}' target"
@cd ${.CURDIR} && \
- ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SUSEQ}"
+ ${SU_CMD} "${MAKE} ${_${target:tu}_SUSEQ}"
@${ECHO_MSG} "===> Returning to user credentials"
@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.elif defined(USE_SUBMAKE)
${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
@cd ${.CURDIR} && \
- ${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SEQ} ${_${target:tu}_SUSEQ}
+ ${MAKE} ${_${target:tu}_SEQ} ${_${target:tu}_SUSEQ}
@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.else
${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_SEQ} ${_${target:tu}_SUSEQ}
@@ -2890,7 +2890,7 @@
.if !target(checkpatch)
checkpatch:
- @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} PATCH_CHECK_ONLY=yes ${_PATCH_DEP} ${_PATCH_SEQ}
+ @cd ${.CURDIR} && ${MAKE} PATCH_CHECK_ONLY=yes ${_PATCH_DEP} ${_PATCH_SEQ}
.endif
# Reinstall
More information about the Midnightbsd-cvs
mailing list