From naddy@mips.inka.de  Wed Dec 20 16:30:38 2000
Return-Path: <naddy@mips.inka.de>
Received: from mail.inka.de (quechua.inka.de [212.227.14.2])
	by hub.freebsd.org (Postfix) with ESMTP id 2274E37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Dec 2000 16:30:38 -0800 (PST)
Received: from kemoauc.mips.inka.de (uucp@)
	by mail.inka.de with local-bsmtp 
	id 148tcy-0005am-00; Thu, 21 Dec 2000 01:30:36 +0100
Received: (from naddy@localhost)
	by kemoauc.mips.inka.de (8.11.1/8.11.1) id eBL0MqS46693;
	Thu, 21 Dec 2000 01:22:52 +0100 (CET)
	(envelope-from naddy)
Message-Id: <200012210022.eBL0MqS46693@kemoauc.mips.inka.de>
Date: Thu, 21 Dec 2000 01:22:52 +0100 (CET)
From: Christian Weisgerber <naddy@mips.inka.de>
Reply-To: naddy@mips.inka.de
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: devel/patch namespace conflict
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         23702
>Category:       ports
>Synopsis:       devel/patch namespace conflict
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    trevor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 20 16:40:00 PST 2000
>Closed-Date:    Wed Jan 10 16:45:54 PST 2001
>Last-Modified:  Wed Jan 10 16:57:04 PST 2001
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Thu Dec 7 17:54:55 CET 2000 naddy@kemoauc.mips.inka.de:/usr/obj/usr/src/sys/KEMOAUC alpha
	
>Description:

The devel/patch port installs GNU patch-2.5 as ${PREFIX}/bin/patch.
This version of GNU patch differs notably from FreeBSD's native
patch in usage and behavior.  Users should not run into different
programs under the same name depending on how their path is set.

The port should install GNU patch under a different name, e.g.
"gpatch" in line with previous GNU and ports tradition.

>How-To-Repeat:

>Fix:

The patch set below
- changes devel/patch to install with a 'g' prefix,
- fixes the package description,
- updates the japanese/postgresql7 and www/w3m ports, which have
  GNU patch as a build time dependency, to refer to "gpatch".

Index: devel/patch/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/patch/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/patch/Makefile	2000/04/11 21:30:03	1.4
+++ devel/patch/Makefile	2000/12/20 23:57:26
@@ -14,7 +14,8 @@
 MAINTAINER=	ache@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--program-prefix=g
 
-MAN1=		patch.1
+MAN1=		gpatch.1
 
 .include <bsd.port.mk>
Index: devel/patch/pkg-comment
===================================================================
RCS file: /home/ncvs/ports/devel/patch/pkg-comment,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-comment
--- devel/patch/pkg-comment	1998/01/21 07:05:20	1.1.1.1
+++ devel/patch/pkg-comment	2000/12/20 23:58:20
@@ -1 +1 @@
-GNU Patch Utility
+GNU patch utility
Index: devel/patch/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/devel/patch/pkg-descr,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-descr
--- devel/patch/pkg-descr	1998/01/21 07:05:20	1.1.1.1
+++ devel/patch/pkg-descr	2000/12/21 00:00:02
@@ -1,4 +1,4 @@
-patch takes a patch file patchfile containing a difference
-listing produced by the diff  program  and  applies  those
-differences  to  one  or  more  original  files, producing
-patched versions.
+The patch program takes a patch file containing a difference
+listing produced by the diff program and applies those
+differences to one or more original files, producing patched
+versions.
Index: devel/patch/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/patch/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- devel/patch/pkg-plist	1998/08/12 01:55:30	1.2
+++ devel/patch/pkg-plist	2000/12/20 23:57:33
@@ -1 +1 @@
-bin/patch
+bin/gpatch
Index: japanese/postgresql7/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/postgresql7/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- japanese/postgresql7/Makefile	2000/12/07 11:36:01	1.20
+++ japanese/postgresql7/Makefile	2000/12/21 00:06:48
@@ -64,7 +64,7 @@
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCDIR=		${WRKDIR}/${DISTNAME}/doc
 
-PATCH=		${LOCALBASE}/bin/patch
+PATCH=		${LOCALBASE}/bin/gpatch
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
Index: www/w3m/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/w3m/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- www/w3m/Makefile	2000/12/10 16:05:14	1.23
+++ www/w3m/Makefile	2000/12/21 00:07:21
@@ -25,8 +25,8 @@
 MAINTAINER=	nobutaka@nobutaka.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
-		${LOCALBASE}/bin/patch:${PORTSDIR}/devel/patch
-PATCH=		${LOCALBASE}/bin/patch
+		${PATCH}:${PORTSDIR}/devel/patch
+PATCH=		${LOCALBASE}/bin/gpatch
 
 W3M_VERSION=	0.1.11
 W3M_PATCHLEVEL=	23

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->ache 
Responsible-Changed-By: jedgar 
Responsible-Changed-When: Mon Dec 25 05:41:01 PST 2000 
Responsible-Changed-Why:  
Over to maintainer 

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

From: "Akinori MUSHA" <knu@iDaemons.org>
To: ache@FreeBSD.org
Cc: naddy@mips.inka.de, FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/23702: devel/patch namespace conflict
Date: Wed, 10 Jan 2001 03:46:47 +0900

 Hi,
 
 > - changes devel/patch to install with a 'g' prefix,
 
 Would you approve this change?
 
 Having two executables of the same name in different paths causes/is
 causing unexpected and undesired troubles.  It would be quite handy to
 be able to name either of them appropriately.
 
 The 'g' prefix may sound weird because /usr/bin/patch is also "GNU"
 patch, however, we could think this way: /usr/bin/patch is the patch
 of our choice (2.1), while ${PREFIX}/bin/gpatch is the patch of GNU's
 latest version (2.5).
 
 -- 
                      /
                     /__  __            Akinori.org / MUSHA.org
                    / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
 Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp
 
 "We're only at home when we're on the run, on the wing, on the fly"
 
Responsible-Changed-From-To: ache->freebsd-ports 
Responsible-Changed-By: sf 
Responsible-Changed-When: Wed Jan 10 09:36:10 PST 2001 
Responsible-Changed-Why:  
maintainer dropped his maintainership. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23702 
Responsible-Changed-From-To: freebsd-ports->trevor 
Responsible-Changed-By: trevor 
Responsible-Changed-When: Wed Jan 10 10:18:18 PST 2001 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23702 
State-Changed-From-To: open->closed 
State-Changed-By: trevor 
State-Changed-When: Wed Jan 10 16:45:54 PST 2001 
State-Changed-Why:  
Committed--thanks, Christian. 

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