Date: Thu, 21 Dec 2000 01:22:52 +0100 (CET) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/23702: devel/patch namespace conflict Message-ID: <200012210022.eBL0MqS46693@kemoauc.mips.inka.de> Resent-Message-ID: <200012210040.eBL0e1o20443@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23702
>Category: ports
>Synopsis: devel/patch namespace conflict
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 20 16:40:00 PST 2000
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012210022.eBL0MqS46693>