From nobody@FreeBSD.org  Thu Feb 21 03:59:20 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id A3D338A6
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 21 Feb 2013 03:59:20 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C177FB5
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 21 Feb 2013 03:59:20 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r1L3xK1K064851
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 21 Feb 2013 03:59:20 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r1L3xK2j064850;
	Thu, 21 Feb 2013 03:59:20 GMT
	(envelope-from nobody)
Message-Id: <201302210359.r1L3xK2j064850@red.freebsd.org>
Date: Thu, 21 Feb 2013 03:59:20 GMT
From: Pedro Giffuni <pfg@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [exp-run] Please test new BSD-licensed patch
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176313
>Category:       ports
>Synopsis:       [exp-run] Please test new BSD-licensed patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pfg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 21 04:00:00 UTC 2013
>Closed-Date:    Fri Jul 26 21:31:41 UTC 2013
>Last-Modified:  Fri Jul 26 21:40:01 UTC 2013
>Originator:     Pedro Giffuni
>Release:        10-current
>Organization:
>Environment:
>Description:
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
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pfg 
Responsible-Changed-When: Thu Feb 21 19:00:13 UTC 2013 
Responsible-Changed-Why:  
Assign to natural owner. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176313 

From: Baptiste Daroussin <bapt@freebsd.org>
To: bug-followup@freebsd.org, pfg@freebsd.org
Cc:  
Subject: Re: ports/176313: [exp-run] Please test new BSD-licensed patch
Date: Fri, 22 Feb 2013 08:54:42 +0100

 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

Date: Fri, 19 Jul 2013 11:57:03 -0500
From: Pedro Giffuni <pfg@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: gabor@FreeBSD.org, Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: [exp-run] Please test new BSD-licensed patch

 This is a multi-part message in MIME format.
 --------------040209060908090603090504
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 
 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.
 
 --------------040209060908090603090504
 Content-Type: text/x-patch;
  name="gnu-patch.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="gnu-patch.diff"
 
 Index: gnu/usr.bin/patch/Makefile
 ===================================================================
 --- gnu/usr.bin/patch/Makefile	(revision 253470)
 +++ gnu/usr.bin/patch/Makefile	(working copy)
 @@ -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
 Index: share/mk/bsd.own.mk
 ===================================================================
 --- share/mk/bsd.own.mk	(revision 253470)
 +++ share/mk/bsd.own.mk	(working copy)
 @@ -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 \
 Index: tools/build/options/WITH_BSD_PATCH
 ===================================================================
 --- tools/build/options/WITH_BSD_PATCH	(revision 253470)
 +++ tools/build/options/WITH_BSD_PATCH	(working copy)
 @@ -1,2 +0,0 @@
 -.\" $FreeBSD$
 -Install BSD-licensed patch as 'patch' instead of GNU patch.
 Index: tools/build/options/WITH_GNU_PATCH
 ===================================================================
 --- tools/build/options/WITH_GNU_PATCH	(working copy)
 +++ tools/build/options/WITH_GNU_PATCH	(working copy)
 @@ -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.
 Index: usr.bin/patch/Makefile
 ===================================================================
 --- usr.bin/patch/Makefile	(revision 253470)
 +++ usr.bin/patch/Makefile	(working copy)
 @@ -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
 
 --------------040209060908090603090504--

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.
 
 
 
 --------------050809050504060302090703
 Content-Type: text/x-patch;
  name="gnu-patch.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="gnu-patch.diff"
 
 Index: gnu/usr.bin/patch/Makefile
 ===================================================================
 --- gnu/usr.bin/patch/Makefile	(revision 253470)
 +++ gnu/usr.bin/patch/Makefile	(working copy)
 @@ -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
 Index: share/mk/bsd.own.mk
 ===================================================================
 --- share/mk/bsd.own.mk	(revision 253470)
 +++ share/mk/bsd.own.mk	(working copy)
 @@ -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 \
 Index: tools/build/options/WITH_BSD_PATCH
 ===================================================================
 --- tools/build/options/WITH_BSD_PATCH	(revision 253470)
 +++ tools/build/options/WITH_BSD_PATCH	(working copy)
 @@ -1,2 +0,0 @@
 -.\" $FreeBSD$
 -Install BSD-licensed patch as 'patch' instead of GNU patch.
 Index: tools/build/options/WITH_GNU_PATCH
 ===================================================================
 --- tools/build/options/WITH_GNU_PATCH	(working copy)
 +++ tools/build/options/WITH_GNU_PATCH	(working copy)
 @@ -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.
 Index: usr.bin/patch/Makefile
 ===================================================================
 --- usr.bin/patch/Makefile	(revision 253470)
 +++ usr.bin/patch/Makefile	(working copy)
 @@ -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
 
 --------------050809050504060302090703--
Responsible-Changed-From-To: portmgr->bapt 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Tue Jul 23 06:12:14 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176313 

From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Pedro Giffuni <pfg@FreeBSD.org>
Cc: portmgr@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: ports/176313:  [exp-run] Please test new BSD-licensed patch
Date: Wed, 24 Jul 2013 11:35:04 +0200

 --Bu8it7iiRSEf40bY
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 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 GNA=
 TS.
 >=20
 > From: Pedro Giffuni <pfg@FreeBSD.org>
 > To: bug-followup@FreeBSD.org
 > Cc: =20
 > Subject: Re: ports/176313:  [exp-run] Please test new BSD-licensed patch
 > Date: Fri, 19 Jul 2013 20:42:30 -0500
 >=20
 >  This is a multi-part message in MIME format.
 >  --------------050809050504060302090703
 >  Content-Type: text/plain; charset=3DISO-8859-1; format=3Dflowed
 >  Content-Transfer-Encoding: 7bit
 > =20
 >  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.
 > =20
 >  Still some evaluation from our side before the switch would
 >  be good though.
 > =20
 >  The attached patch moves us from the WITH_BSD_PATCH
 >  option to a WITH_GNU_PATCH option.
 > =20
 > =20
 
 There is 2 regressions, once fixed, there is no objection from portmgr
 
 emulators/kqemu-kmod-devel
 devel/ncurses-devel
 
 regardsn
 Bapt
 
 --Bu8it7iiRSEf40bY
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlHvn8cACgkQ8kTtMUmk6ExHwgCdGbYGE9vz7t+OotdIivvaJbPJ
 ANwAniF680xwySUi5ggcWp6TvwQ9pabn
 =C9n+
 -----END PGP SIGNATURE-----
 
 --Bu8it7iiRSEf40bY--

From: Pedro Giffuni <pfg@FreeBSD.org>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Cc: portmgr@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: ports/176313:  [exp-run] Please test new BSD-licensed patch
Date: Wed, 24 Jul 2013 22:31:33 -0500

 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.
 

From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Pedro Giffuni <pfg@FreeBSD.org>
Cc: portmgr@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: ports/176313:  [exp-run] Please test new BSD-licensed patch
Date: Thu, 25 Jul 2013 08:33:10 +0200

 --iAL9S67WQOXgEPD9
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Wed, Jul 24, 2013 at 10:31:33PM -0500, Pedro Giffuni wrote:
 > Hello;
 >=20
 > 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
 > >
 >=20
 > 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(?).
 >=20
 > Setting PATCH_DIST_STRIP=3D -p1 in the specific cases seems to
 > workaround (the lack of) the feature.
 >=20
 > I have submitted PRs
 >=20
 > ports/180817 - kqemu-kmod-devel
 > ports/180821 - ncurses-devel
 >=20
 > with fixes.
 >=20
 > Pedro.
 >=20
 
 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
 
 --iAL9S67WQOXgEPD9
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlHwxqQACgkQ8kTtMUmk6ExVqACdGXW3+AhJNrdUoAk0PqTUNebk
 VzcAoLh+u+Vwc8q6TLlqvf/bzkAXKyG0
 =9Rsf
 -----END PGP SIGNATURE-----
 
 --iAL9S67WQOXgEPD9--
Responsible-Changed-From-To: bapt->pfg 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Fri Jul 26 16:58:23 UTC 2013 
Responsible-Changed-Why:  
Back to submitter 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176313 
State-Changed-From-To: open->closed 
State-Changed-By: pfg 
State-Changed-When: Fri Jul 26 21:29:12 UTC 2013 
State-Changed-Why:  
Ports have been fixed and BSD-licensed patch is not the default. 

Thank you to portmgr@ for providing support for this change. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176313 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176313: commit references a PR
Date: Fri, 26 Jul 2013 21:25:27 +0000 (UTC)

 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"
 

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, 26 Jul 2013 16:35:59 -0500

 On 26.07.2013 16:31, pfg wrote:
 >   
 > Ports have been fixed and BSD-licensed patch is not the default.
 
 s/not/now/
 
 
>Unformatted:
