On 10/08/2011 11:25, Chris Rees wrote: > Author: crees (ports committer) > Date: Sat Oct 8 18:25:01 2011 > New Revision: 226162 > URL: http://svn.freebsd.org/changeset/base/226162 > > Log: > Revert unapproved commit to bsd.port.mk.
This is completely unacceptable. We don't do "commit wars" in FreeBSD. IF it's accurate that portmgr has custody on this file (as opposed to ports/Mk/bsd.port.mk where they unquestionably do), and IF portmgr had a problem with this commit, it's up to them to deal with it. The fact that you don't think it's a good idea (for whatever reason) frankly isn't relevant. > This would have had more discussion, but it was explicitly rejected at > submission by portmgr: > > http://lists.freebsd.org/pipermail/freebsd-ports/2011-September/070591.html I read that message as rejecting the idea of applying it to ports/Mk/bsd.port.mk, and I think Jilles and Ed applied a very creative solution to keeping things moving on HEAD without impacting the ports tree itself. Doug > Modified: > head/share/mk/bsd.port.mk > > Modified: head/share/mk/bsd.port.mk > ============================================================================== > --- head/share/mk/bsd.port.mk Sat Oct 8 16:45:03 2011 (r226161) > +++ head/share/mk/bsd.port.mk Sat Oct 8 18:25:01 2011 (r226162) > @@ -14,19 +14,3 @@ _WITHOUT_SRCCONF= > > .include <bsd.own.mk> > .include "${BSDPORTMK}" > - > -.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) > -# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. > -run-autotools-fixup: > - test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \ > - -name config.rpath -o -name configure -o -name libtool.m4 \) \ > - -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ > - -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ > - -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ > - -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ > - -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ > - {} + || /usr/bin/true > - > -.ORDER: run-autotools run-autotools-fixup do-configure > -do-configure: run-autotools-fixup > -.endif > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
