diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/charsetfix.mk | 1 | ||||
| -rw-r--r-- | Mk/Uses/pathfix.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk index 34f47f35dde1..edd1dc7fdd66 100644 --- a/Mk/Uses/charsetfix.mk +++ b/Mk/Uses/charsetfix.mk @@ -18,7 +18,6 @@ IGNORE= USES=charsetfix does not require args CHARSETFIX_MAKEFILEIN?= Makefile.in -.PHONY: charsetfix-post-patch charsetfix-post-patch: @${FIND} ${WRKSRC} -name "${CHARSETFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} \ -e 's|need_charset_alias=true|need_charset_alias=false|g ; \ diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 7bac6d57bf66..069c056dc156 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -19,7 +19,6 @@ IGNORE= USES=pathfix does not require args PATHFIX_MAKEFILEIN?= Makefile.in -.PHONY: pathfix-pre-patch pathfix-pre-patch: @${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b8cf7f0b3dde..82d7ae8e588f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1127,6 +1127,7 @@ SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses SCRIPTSDIR?= ${PORTSDIR}/Mk/Scripts LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/lib +NOTPHONY?= .if defined(FORCE_STAGE) .undef NO_STAGE @@ -4256,7 +4257,6 @@ security-check: # call the necessary targets/scripts. ################################################################ -.PHONY: extract-message patch-message configure-message stage-message install-message package-message extract-message: @${ECHO_MSG} "===> Extracting for ${PKGNAME}" patch-message: @@ -6545,17 +6545,25 @@ _PACKAGE_SEQ= package-message pre-package pre-package-script \ .for _t in ${_TARGETS_STAGES} . for s in ${_${_t}_SEQ} . if target(${s}) +. if ! ${NOTPHONY:M${s}} +_PHONY_TARGETS+= ${s} +. endif _${_t}_REAL_SEQ+= ${s} . endif . endfor . for s in ${_${_t}_SUSEQ} . if target(${s}) +. if ! ${NOTPHONY:M${s}} +_PHONY_TARGETS+= ${s} +. endif _${_t}_REAL_SUSEQ+= ${s} . endif . endfor .ORDER: ${_${_t}_DEP} ${_${_t}_REAL_SEQ} .endfor +.PHONY: ${_PHONY_TARGETS} + .for target in extract patch configure build stage install package .if !target(${target}) && defined(_OPTIONS_OK) @@ -6601,6 +6609,8 @@ ${${target:U}_COOKIE}:: .endfor +.PHONY: check-sanity fetch pkg + .if !target(check-sanity) check-sanity: ${_SANITY_REAL_SEQ} .endif |