From edwin@mavetju.org  Sun Jan 22 01:19:53 2006
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 61A7E16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 01:19:53 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: from mail2out.barnet.com.au (mail2out.barnet.com.au [202.83.176.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1AFA743D66
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 01:19:50 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: by mail2out.barnet.com.au (Postfix, from userid 27)
	id 20D137073FF; Sun, 22 Jan 2006 12:19:49 +1100 (EST)
Received: from mail2-auth.barnet.com.au (mail2.barnet.com.au [202.83.176.13])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK))
	by mail2.barnet.com.au (Postfix) with ESMTP id D81187073FD
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 12:19:48 +1100 (EST)
Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mail2-auth.barnet.com.au (Postfix) with ESMTP id 40EAA7073F9
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 12:19:48 +1100 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 3868842F; Sun, 22 Jan 2006 12:19:47 +1100 (EST)
Message-Id: <20060122011947.3868842F@k7.mavetju>
Date: Sun, 22 Jan 2006 12:19:47 +1100 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] remove USE_REINPLACE from bsd.port.mk USE_DOS2UNIX patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92124
>Category:       ports
>Synopsis:       [patch] remove USE_REINPLACE from bsd.port.mk USE_DOS2UNIX patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 22 01:30:05 GMT 2006
>Closed-Date:    Sat Jan 28 02:15:49 GMT 2006
>Last-Modified:  Sat Jan 28 02:15:49 GMT 2006
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386


>Description:

    Due to a clash of patches, the USE_DOS2UNIX patch has introduced
    USE_REINPLACE in bsd.port.mk:

	.if defined(USE_DOS2UNIX)
	USE_REINPLACE=  yes
	.endif

>How-To-Repeat:
>Fix:

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.521
diff -u -r1.521 bsd.port.mk
--- bsd.port.mk	21 Jan 2006 22:07:08 -0000	1.521
+++ bsd.port.mk	22 Jan 2006 01:19:37 -0000
@@ -1510,10 +1510,6 @@
 CONFIGURE_ENV+=	MAKE=${GMAKE}
 .endif
 
-.if defined(USE_DOS2UNIX)
-USE_REINPLACE=	yes
-.endif
-
 .if defined(USE_GCC)
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
 .endif
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 22 02:25:56 UTC 2006 
Responsible-Changed-Why:  
portmgr territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92124 
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Sun Jan 22 19:42:31 UTC 2006 
State-Changed-Why:  
Accepted for a test build on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92124 
State-Changed-From-To: analyzed->closed 
State-Changed-By: linimon 
State-Changed-When: Sat Jan 28 02:15:41 UTC 2006 
State-Changed-Why:  
Committed, thanks. 

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