From owner-svn-ports-head@FreeBSD.ORG Fri Dec 5 10:47:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC9C8BE; Fri, 5 Dec 2014 10:47:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9C37860; Fri, 5 Dec 2014 10:47:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB5Alj1S041231; Fri, 5 Dec 2014 10:47:45 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB5AljvU041230; Fri, 5 Dec 2014 10:47:45 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201412051047.sB5AljvU041230@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 5 Dec 2014 10:47:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374006 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Dec 2014 10:47:46 -0000 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 \