svn commit: r338601 - in head/Mk: . Uses

[Baptiste Daroussin]

Author: bapt
Date: Sat Jan  4 00:02:08 2014
New Revision: 338601
URL: http://svnweb.freebsd.org/changeset/ports/338601

Log:
  Mark all targets defines in _SEQ and .ORDER has .PHONY which they all should be
  If one day we are no adding a target actually correspond to an actual file, simply adding
  the name of the target to the NOTPHONY will make it work as expected

Modified:
  head/Mk/Uses/charsetfix.mk
  head/Mk/Uses/pathfix.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/Uses/charsetfix.mk
==============================================================================
--- head/Mk/Uses/charsetfix.mk	Fri Jan  3 23:49:10 2014	(r338600)
+++ head/Mk/Uses/charsetfix.mk	Sat Jan  4 00:02:08 2014	(r338601)
@@ -18,7 +18,6 @@ IGNORE=	USES=charsetfix does not require
 
 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 ; \

Modified: head/Mk/Uses/pathfix.mk
==============================================================================
--- head/Mk/Uses/pathfix.mk	Fri Jan  3 23:49:10 2014	(r338600)
+++ head/Mk/Uses/pathfix.mk	Sat Jan  4 00:02:08 2014	(r338601)
@@ -19,7 +19,6 @@ IGNORE=	USES=pathfix does not require ar
 
 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 ; \

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Jan  3 23:49:10 2014	(r338600)
+++ head/Mk/bsd.port.mk	Sat Jan  4 00:02:08 2014	(r338601)
@@ -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-packag
 .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