Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Dec 2014 10:47:45 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r374006 - head/Mk
Message-ID:  <201412051047.sB5AljvU041230@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Dec  5 10:47:45 2014
New Revision: 374006
URL: https://svnweb.freebsd.org/changeset/ports/374006
QAT: https://qat.redports.org/buildarchive/r374006/

Log:
  Modify run-autotools-fixup so it only prints "FreeBSD 10 autotools fix
  applied to..." when it modified a file.  Also change _CONFIGURE_SEQ so
  run-autotools-fixup runs after targets like do-autoreconf that can already
  fix some cases.
  
  This will allow us to get a better idea of how big the problem still is.
  
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Dec  5 10:14:58 2014	(r374005)
+++ head/Mk/bsd.port.mk	Fri Dec  5 10:47:45 2014	(r374006)
@@ -3414,9 +3414,10 @@ run-autotools-fixup:
 				-e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
 				-e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
 					$${f} ; \
+			cmp -s $${f}.fbsd10bak $${f} || \
+			${ECHO_MSG} "===>   FreeBSD 10 autotools fix applied to $${f}"; \
 			${TOUCH} ${TOUCH_FLAGS} -mr $${f}.fbsd10bak $${f} ; \
 			${RM} -f $${f}.fbsd10bak ; \
-			${ECHO_MSG} "===>   FreeBSD 10 autotools fix applied to $${f}"; \
 		done
 .endif
 .endif
@@ -5946,9 +5947,9 @@ _PATCH_SEQ=		ask-license patch-message p
 				pre-patch \
 				pre-patch-script do-patch charsetfix-post-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
-_CONFIGURE_SEQ=	build-depends lib-depends configure-message run-autotools-fixup \
+_CONFIGURE_SEQ=	build-depends lib-depends configure-message \
 				pre-configure pre-configure-script \
-				run-autotools do-autoreconf patch-libtool do-configure \
+				run-autotools do-autoreconf patch-libtool run-autotools-fixup do-configure \
 				post-configure post-configure-script
 _BUILD_DEP=		configure
 _BUILD_SEQ=		build-message pre-build pre-build-script do-build \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412051047.sB5AljvU041230>