diff options
| author | edwin <edwin@FreeBSD.org> | 2003-10-09 08:26:03 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-10-09 08:26:03 +0800 |
| commit | 590f3a245781f2cb636ca34f624e39b4cc0f3291 (patch) | |
| tree | 9f466a65c74ba66b93773e0fad30f7f9a2a72d7c /textproc | |
| parent | 2ad77c6d6a1ea3030c8f114499a3b1275188d479 (diff) | |
| download | freebsd-ports-gnome-590f3a245781f2cb636ca34f624e39b4cc0f3291.tar.gz freebsd-ports-gnome-590f3a245781f2cb636ca34f624e39b4cc0f3291.tar.zst freebsd-ports-gnome-590f3a245781f2cb636ca34f624e39b4cc0f3291.zip | |
Update textproc/diffutils
GNU diffutils 2.7 has some serious bugs wrt file ending with no
end of lines.
PR: ports/57189
Submitted by: Samuel Tardieu <sam@rfc1149.net>
Approved by: Garrett Rooney <rooneg@electricjellyfish.net>
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/diffutils/Makefile | 38 | ||||
| -rw-r--r-- | textproc/diffutils/distinfo | 2 | ||||
| -rw-r--r-- | textproc/diffutils/files/patch-diff.texi | 21 | ||||
| -rw-r--r-- | textproc/diffutils/pkg-plist | 3 |
4 files changed, 21 insertions, 43 deletions
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile index 02f117691b97..ac3c6eaef519 100644 --- a/textproc/diffutils/Makefile +++ b/textproc/diffutils/Makefile @@ -6,34 +6,36 @@ # PORTNAME= diffutils -PORTVERSION= 2.7 +PORTVERSION= 2.8.1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= diffutils -MAINTAINER= rooneg@electricjellyfish.net +MAINTAINER= ports@freebsd.org COMMENT= The GNU diff utilities USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=g +CONFIGURE_ARGS= --program-prefix=g -INSTALL_INFO?= install-info +INFO= diff -post-extract: remove-info-files +MAN1= gcmp.1 gdiff.1 gdiff3.1 gsdiff.1 -remove-info-files: - @${RM} -f ${WRKSRC}/${PORTNAME:S/utils//}.info* - -post-patch: patch-makeinfo - -patch-makeinfo: - @${REINPLACE_CMD} -e 's|makeinfo|makeinfo --no-split|g' \ - ${WRKSRC}/Makefile.in - -post-install: install-info - -install-info: - @${INSTALL_INFO} ${PREFIX}/info/${PORTNAME:S/utils//}.info ${PREFIX}/info/dir +#post-extract: remove-info-files +# +#remove-info-files: +# @${RM} -f ${WRKSRC}/${PORTNAME:S/utils//}.info* +# +#post-patch: patch-makeinfo +# +#patch-makeinfo: +# @${REINPLACE_CMD} -e 's|makeinfo|makeinfo --no-split|g' \ +# ${WRKSRC}/Makefile.in +# +#post-install: install-info +# +#install-info: +# @${INSTALL_INFO} ${PREFIX}/info/${PORTNAME:S/utils//}.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/textproc/diffutils/distinfo b/textproc/diffutils/distinfo index b600335a67f1..8aacf92b6f6a 100644 --- a/textproc/diffutils/distinfo +++ b/textproc/diffutils/distinfo @@ -1 +1 @@ -MD5 (diffutils-2.7.tar.gz) = 300d86a0566afee1c3756828f6c9538a +MD5 (diffutils-2.8.1.tar.gz) = 71f9c5ae19b60608f6c7f162da86a428 diff --git a/textproc/diffutils/files/patch-diff.texi b/textproc/diffutils/files/patch-diff.texi deleted file mode 100644 index 50a0e45ee30a..000000000000 --- a/textproc/diffutils/files/patch-diff.texi +++ /dev/null @@ -1,21 +0,0 @@ ---- diff.texi.orig Fri Sep 30 21:54:40 1994 -+++ diff.texi Sat Sep 8 16:56:14 2001 -@@ -6,6 +6,18 @@ - @c %**end of header - - @ifinfo -+@format -+INFO-DIR-SECTION Comparing and Merging Files -+START-INFO-DIR-ENTRY -+* Comparing files: (diff). Comparing and Merging Files. -+* cmp: (diff)cmp invocation. Compares two files. -+* diff: (diff)diff invocation. Pretty compares two files. -+* diff3: (diff)diff3 invocation. Compares and Merges three files. -+* patch: (diff)patch invocation. Apply a diff file to an original -+* sdiff: (diff)sdiff invocation. Interactively compares two files -+END-INFO-DIR-ENTRY -+@end format -+ - This file documents the the GNU @code{diff}, @code{diff3}, @code{sdiff}, - and @code{cmp} commands for showing the differences between text files - and the @code{patch} command for using their output to update files. diff --git a/textproc/diffutils/pkg-plist b/textproc/diffutils/pkg-plist index f1014b5e7f98..3383894657d1 100644 --- a/textproc/diffutils/pkg-plist +++ b/textproc/diffutils/pkg-plist @@ -3,6 +3,3 @@ bin/gcmp bin/gdiff bin/gdiff3 bin/gsdiff -@unexec install-info --quiet --delete %D/info/diff.info %D/info/dir -info/diff.info -@exec install-info %D/info/diff.info %D/info/dir |