diff options
| author | trevor <trevor@FreeBSD.org> | 2001-01-11 08:56:26 +0800 |
|---|---|---|
| committer | trevor <trevor@FreeBSD.org> | 2001-01-11 08:56:26 +0800 |
| commit | 2956aa16edfdc52f46a9a75a3343be2a71345b6d (patch) | |
| tree | 757ee894ec48f0f3a54ff0ba9ee287da774b1ca1 | |
| parent | bf357ff0eef42918c3f5736fc3471dbc00c45991 (diff) | |
| download | freebsd-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
| -rw-r--r-- | devel/patch/Makefile | 3 | ||||
| -rw-r--r-- | devel/patch/pkg-comment | 2 | ||||
| -rw-r--r-- | devel/patch/pkg-descr | 8 | ||||
| -rw-r--r-- | devel/patch/pkg-plist | 2 | ||||
| -rw-r--r-- | japanese/postgresql-tcltk/Makefile | 2 | ||||
| -rw-r--r-- | japanese/postgresql7/Makefile | 2 | ||||
| -rw-r--r-- | www/w3m/Makefile | 4 |
7 files changed, 12 insertions, 11 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 diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile index bf0de683879f..944f06297cf9 100644 --- a/japanese/postgresql-tcltk/Makefile +++ b/japanese/postgresql-tcltk/Makefile @@ -64,7 +64,7 @@ SCRIPTS_ENV+= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${DISTNAME}/src DOCDIR= ${WRKDIR}/${DISTNAME}/doc -PATCH= ${LOCALBASE}/bin/patch +PATCH= ${LOCALBASE}/bin/gpatch USE_GMAKE= YES MAKEFILE= GNUmakefile HAS_CONFIGURE= YES diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile index bf0de683879f..944f06297cf9 100644 --- a/japanese/postgresql7/Makefile +++ b/japanese/postgresql7/Makefile @@ -64,7 +64,7 @@ SCRIPTS_ENV+= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${DISTNAME}/src DOCDIR= ${WRKDIR}/${DISTNAME}/doc -PATCH= ${LOCALBASE}/bin/patch +PATCH= ${LOCALBASE}/bin/gpatch USE_GMAKE= YES MAKEFILE= GNUmakefile HAS_CONFIGURE= YES diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 3d0da595f505..675fec4ef490 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -25,8 +25,8 @@ PATCH_DIST_STRIP= -p1 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 |