From pfg@FreeBSD.org  Fri Jul 19 17:04:02 2013
Return-Path: <pfg@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 9E0B3AB0
	for <bug-followup@freebsd.org>; Fri, 19 Jul 2013 17:04:02 +0000 (UTC)
	(envelope-from pfg@FreeBSD.org)
Received: from nm45-vm5.bullet.mail.gq1.yahoo.com (nm45-vm5.bullet.mail.gq1.yahoo.com [67.195.87.163])
	by mx1.freebsd.org (Postfix) with ESMTP id ABB9C68B
	for <bug-followup@freebsd.org>; Fri, 19 Jul 2013 17:04:01 +0000 (UTC)
Received: from [98.137.12.55] by nm45.bullet.mail.gq1.yahoo.com with NNFMP; 19 Jul 2013 16:57:05 -0000
Received: from [208.71.42.205] by tm15.bullet.mail.gq1.yahoo.com with NNFMP; 19 Jul 2013 16:57:05 -0000
Received: from [127.0.0.1] by smtp216.mail.gq1.yahoo.com with NNFMP; 19 Jul 2013 16:57:05 -0000
Message-Id: <51E96FDF.2070303@FreeBSD.org>
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

>Number:         180659
>Category:       ports
>Synopsis:       Re: [exp-run] Please test new BSD-licensed patch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 19 17:10:00 UTC 2013
>Closed-Date:    Sat Jul 20 01:32:29 UTC 2013
>Last-Modified:  Sat Jul 20 01:32:29 UTC 2013
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 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--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Jul 20 01:31:41 UTC 2013 
State-Changed-Why:  
Misfiled followup to ports/176313; content migrated. 


Responsible-Changed-From-To: gnats-admin->portmgr 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Jul 20 01:31:41 UTC 2013 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=180659 
>Unformatted:
