aboutsummaryrefslogtreecommitdiffstats
path: root/devel/patch
diff options
context:
space:
mode:
authortrevor <trevor@FreeBSD.org>2001-01-11 08:56:26 +0800
committertrevor <trevor@FreeBSD.org>2001-01-11 08:56:26 +0800
commit2956aa16edfdc52f46a9a75a3343be2a71345b6d (patch)
tree757ee894ec48f0f3a54ff0ba9ee287da774b1ca1 /devel/patch
parentbf357ff0eef42918c3f5736fc3471dbc00c45991 (diff)
downloadfreebsd-ports-gnome-2956aa16edfdc52f46a9a75a3343be2a71345b6d.tar.gz
freebsd-ports-gnome-2956aa16edfdc52f46a9a75a3343be2a71345b6d.tar.zst
freebsd-ports-gnome-2956aa16edfdc52f46a9a75a3343be2a71345b6d.zip
Avoid conflict with /usr/bin/patch by installing the version from
the ports collection as "gpatch". Beautify the descriptions. Update the ports which depend on this version. PR: 23702 Submitted by: Christian Weisgerber <naddy@mips.inka.de> Reviewed by: knu
Diffstat (limited to 'devel/patch')
-rw-r--r--devel/patch/Makefile3
-rw-r--r--devel/patch/pkg-comment2
-rw-r--r--devel/patch/pkg-descr8
-rw-r--r--devel/patch/pkg-plist2
4 files changed, 8 insertions, 7 deletions
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 5251cf860c70..5d47b01a147d 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR= patch
MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --program-prefix=g
-MAN1= patch.1
+MAN1= gpatch.1
.include <bsd.port.mk>
diff --git a/devel/patch/pkg-comment b/devel/patch/pkg-comment
index e804bd5d94bf..e1e1f747f3a8 100644
--- a/devel/patch/pkg-comment
+++ b/devel/patch/pkg-comment
@@ -1 +1 @@
-GNU Patch Utility
+GNU patch utility
diff --git a/devel/patch/pkg-descr b/devel/patch/pkg-descr
index 2cd4d0f98b23..f08a8d13297e 100644
--- a/devel/patch/pkg-descr
+++ b/devel/patch/pkg-descr
@@ -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.
diff --git a/devel/patch/pkg-plist b/devel/patch/pkg-plist
index dc711015cfb7..80ac5b197b77 100644
--- a/devel/patch/pkg-plist
+++ b/devel/patch/pkg-plist
@@ -1 +1 @@
-bin/patch
+bin/gpatch