I can't think of a better test for the new /usr/bin/patch than running an exp-run with it. Please test using WITH_BSD_PATCH = yes
Responsible Changed From-To: freebsd-ports-bugs->portmgr Assign to natural owner.
Thanks for patch, Please note that currently our capacity to make exp-run is very low and the backlog of exp-run request is quite high. Just to say that this exp-run may take long to happen, but will eventually happen. regards, Bapt
I have been waiting for a while for this and it would seem like the change should be sufficiently relevant for portmgr to give it some priority, but it simply hasn't happened. In any case, the DragonFly guys have tested the BSD licensed patch with FreeBSD's ports so it would seem like a good time to do the switch. The attached patch moves (literally) the WITH_BSD_PATCH option to a WITH_GNU_PATCH option. I am not very used to changes in the build system so some testing would be good. Regards, Pedro.
It looks like the DragonFlyBSD guys got ahead of us testing this and moved to ports before we switched to "their" patch. Apparently they haven't had trouble with it. Still some evaluation from our side before the switch would be good though. The attached patch moves us from the WITH_BSD_PATCH option to a WITH_GNU_PATCH option.
Responsible Changed From-To: portmgr->bapt I'll take it.
On Sat, Jul 20, 2013 at 01:50:01AM +0000, Pedro Giffuni wrote: > The following reply was made to PR ports/176313; it has been noted by GNATS. > > From: Pedro Giffuni <pfg@FreeBSD.org> > To: bug-followup@FreeBSD.org > Cc: > Subject: Re: ports/176313: [exp-run] Please test new BSD-licensed patch > Date: Fri, 19 Jul 2013 20:42:30 -0500 > > This is a multi-part message in MIME format. > --------------050809050504060302090703 > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > Content-Transfer-Encoding: 7bit > > It looks like the DragonFlyBSD guys got ahead of us testing > this and moved to ports before we switched to "their" patch. > Apparently they haven't had trouble with it. > > Still some evaluation from our side before the switch would > be good though. > > The attached patch moves us from the WITH_BSD_PATCH > option to a WITH_GNU_PATCH option. > > There is 2 regressions, once fixed, there is no objection from portmgr emulators/kqemu-kmod-devel devel/ncurses-devel regardsn Bapt
Hello; On 24.07.2013 04:35, Baptiste Daroussin wrote: > > There is 2 regressions, once fixed, there is no objection from portmgr > > emulators/kqemu-kmod-devel > devel/ncurses-devel > The problem appears to be that GNU patch has some way of determining the patch level when used with distribution patches. I still have to investigate if there is some special ports magic behind this(?). Setting PATCH_DIST_STRIP= -p1 in the specific cases seems to workaround (the lack of) the feature. I have submitted PRs ports/180817 - kqemu-kmod-devel ports/180821 - ncurses-devel with fixes. Pedro.
On Wed, Jul 24, 2013 at 10:31:33PM -0500, Pedro Giffuni wrote: > Hello; > > On 24.07.2013 04:35, Baptiste Daroussin wrote: > > > > There is 2 regressions, once fixed, there is no objection from portmgr > > > > emulators/kqemu-kmod-devel > > devel/ncurses-devel > > > > The problem appears to be that GNU patch has some way of > determining the patch level when used with distribution patches. > I still have to investigate if there is some special ports magic > behind this(?). > > Setting PATCH_DIST_STRIP= -p1 in the specific cases seems to > workaround (the lack of) the feature. > > I have submitted PRs > > ports/180817 - kqemu-kmod-devel > ports/180821 - ncurses-devel > > with fixes. > > Pedro. > No I see I didn't replied to all. Given they were the 2 only failures due to bsdpatch, then I do approve the switch to bsdpatch as soon as both are fixed. thank you. regards, Bapt
Responsible Changed From-To: bapt->pfg Back to submitter
Author: pfg Date: Fri Jul 26 21:25:18 2013 New Revision: 253689 URL: http://svnweb.freebsd.org/changeset/base/253689 Log: Make the BSD-licensed patch the default. The BSD-licensed patch(1) command has matured and it's behaviour can be considered equivalent to the older version of GNU patch in the tree. The switch has been extensively tested [1] and only two ports presented regressions, which have since been fixed. For convenience a new WITH_GNU_PATCH option is available, but it will likely be removed in the near future. PR: 176313 Approved by: portmgr Added: head/tools/build/options/WITH_GNU_PATCH - copied, changed from r253470, head/tools/build/options/WITH_BSD_PATCH Deleted: head/tools/build/options/WITH_BSD_PATCH Modified: head/gnu/usr.bin/patch/Makefile head/share/mk/bsd.own.mk head/usr.bin/patch/Makefile Modified: head/gnu/usr.bin/patch/Makefile ============================================================================== --- head/gnu/usr.bin/patch/Makefile Fri Jul 26 20:54:33 2013 (r253688) +++ head/gnu/usr.bin/patch/Makefile Fri Jul 26 21:25:18 2013 (r253689) @@ -2,14 +2,14 @@ .include <bsd.own.mk> -.if ${MK_BSD_PATCH} == "yes" +.if ${MK_GNU_PATCH} == "yes" +PROG= patch +.else PROG= gnupatch CLEANFILES+= gnupatch.1 gnupatch.1: patch.1 cp ${.ALLSRC} ${.TARGET} -.else -PROG= patch .endif SRCS= backupfile.c inp.c patch.c pch.c util.c version.c Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Fri Jul 26 20:54:33 2013 (r253688) +++ head/share/mk/bsd.own.mk Fri Jul 26 21:25:18 2013 (r253689) @@ -364,7 +364,6 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ - BSD_PATCH \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -375,6 +374,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ CTF \ DEBUG_FILES \ + GNU_PATCH \ GPL_DTC \ HESIOD \ ICONV \ Copied and modified: head/tools/build/options/WITH_GNU_PATCH (from r253470, head/tools/build/options/WITH_BSD_PATCH) ============================================================================== --- head/tools/build/options/WITH_BSD_PATCH Fri Jul 19 12:43:20 2013 (r253470, copy source) +++ head/tools/build/options/WITH_GNU_PATCH Fri Jul 26 21:25:18 2013 (r253689) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Install BSD-licensed patch as 'patch' instead of GNU patch. +Install GNU-licensed patch as 'patch' instead of BSD patch. Modified: head/usr.bin/patch/Makefile ============================================================================== --- head/usr.bin/patch/Makefile Fri Jul 26 20:54:33 2013 (r253688) +++ head/usr.bin/patch/Makefile Fri Jul 26 21:25:18 2013 (r253689) @@ -3,14 +3,14 @@ .include <bsd.own.mk> -.if ${MK_BSD_PATCH} == "yes" -PROG= patch -.else +.if ${MK_GNU_PATCH} == "yes" PROG= bsdpatch CLEANFILES+= bsdpatch.1 bsdpatch.1: patch.1 cp ${.ALLSRC} ${.TARGET} +.else +PROG= patch .endif SRCS= backupfile.c inp.c mkpath.c patch.c pch.c util.c _______________________________________________ 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-unsubscribe@freebsd.org"
State Changed From-To: open->closed Ports have been fixed and BSD-licensed patch is not the default. Thank you to portmgr@ for providing support for this change.
On 26.07.2013 16:31, pfg wrote: > > Ports have been fixed and BSD-licensed patch is not the default. s/not/now/