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

[Baptiste Daroussin]

Author: bapt
Date: Fri Jan  3 23:43:34 2014
New Revision: 338598
URL: http://svnweb.freebsd.org/changeset/ports/338598

Log:
  Add pathfix-pre-path to the _PATCH_SEQ and do not anymore make it a dependency of pre-patch
  That makes applying the pathfix target predictable

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

Modified: head/Mk/Uses/pathfix.mk
==============================================================================
--- head/Mk/Uses/pathfix.mk	Fri Jan  3 23:42:10 2014	(r338597)
+++ head/Mk/Uses/pathfix.mk	Fri Jan  3 23:43:34 2014	(r338598)
@@ -20,8 +20,6 @@ IGNORE=	USES=pathfix does not require ar
 PATHFIX_MAKEFILEIN?=	Makefile.in
 
 .PHONY: pathfix-pre-patch
-pre-patch: 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:42:10 2014	(r338597)
+++ head/Mk/bsd.port.mk	Fri Jan  3 23:43:34 2014	(r338598)
@@ -6474,7 +6474,7 @@ _EXTRACT_SEQ=	check-build-conflicts extr
 				pre-extract pre-extract-script do-extract \
 				post-extract post-extract-script
 _PATCH_DEP=		extract
-_PATCH_SEQ=		ask-license patch-message patch-depends pre-patch \
+_PATCH_SEQ=		ask-license patch-message patch-depends pathfix-pre-patch pre-patch \
 				pre-patch-script do-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	build-depends lib-depends configure-message run-autotools-fixup \