From cda2667b6fe258c8327fdfe5342a65bb6b060a9f Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 17 Sep 2011 10:51:22 +0000 Subject: [PATCH] update to wdiff 1.0.1, from Pascal Stumpf. - while there, replace a poorly-formatted DESCR with newer text from upstream --- textproc/wdiff/Makefile | 6 ++++-- textproc/wdiff/distinfo | 10 +++++----- textproc/wdiff/patches/patch-lib_Makefile_in | 8 ++++---- textproc/wdiff/patches/patch-tests_testsuite | 18 ++++++++++++++++++ textproc/wdiff/pkg/DESCR | 12 ++++++------ textproc/wdiff/pkg/PLIST | 3 ++- 6 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 textproc/wdiff/patches/patch-tests_testsuite diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index 0460b25169c..7658b6c0db7 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.25 2011/08/21 16:41:07 jasper Exp $ +# $OpenBSD: Makefile,v 1.26 2011/09/17 10:51:22 sthen Exp $ COMMENT= word differences between text files -DISTNAME= wdiff-0.6.5 +DISTNAME= wdiff-1.0.1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU:=wdiff/} @@ -14,6 +14,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c termcap MODULES= devel/gettext +REGRESS_DEPENDS= misc/screen \ + textproc/gsed CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --prefix="${PREFIX}" USE_GMAKE= Yes diff --git a/textproc/wdiff/distinfo b/textproc/wdiff/distinfo index b4b91368c54..82255a560d1 100644 --- a/textproc/wdiff/distinfo +++ b/textproc/wdiff/distinfo @@ -1,5 +1,5 @@ -MD5 (wdiff-0.6.5.tar.gz) = GCggmhTQGtOMcmeYXzZcvw== -RMD160 (wdiff-0.6.5.tar.gz) = rq1DZZyNg2gxjxsRRYJgeK7sNto= -SHA1 (wdiff-0.6.5.tar.gz) = ih1ddvf6qZmlVzYZufPwp3EeHQg= -SHA256 (wdiff-0.6.5.tar.gz) = VYdWlvX1SBA7gxjPgr3XmqUY8kQ6FnfjD7GSaCE5Mro= -SIZE (wdiff-0.6.5.tar.gz) = 1232434 +MD5 (wdiff-1.0.1.tar.gz) = w7jkihE/0GRzHXNyqueC9Q== +RMD160 (wdiff-1.0.1.tar.gz) = U6jRpkC9aUMDCqAVV+Uq3HWbOXU= +SHA1 (wdiff-1.0.1.tar.gz) = fYLdCCqN+VEKsCnom882drTSHFI= +SHA256 (wdiff-1.0.1.tar.gz) = lOT0Pt/LK/xTB77IzdKlk3UN2GotKBQjZ/cr2upGz8s= +SIZE (wdiff-1.0.1.tar.gz) = 1294317 diff --git a/textproc/wdiff/patches/patch-lib_Makefile_in b/textproc/wdiff/patches/patch-lib_Makefile_in index 6a1131da44c..88dc00ff5b4 100644 --- a/textproc/wdiff/patches/patch-lib_Makefile_in +++ b/textproc/wdiff/patches/patch-lib_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/08/21 16:41:07 jasper Exp $ +$OpenBSD: patch-lib_Makefile_in,v 1.2 2011/09/17 10:51:22 sthen Exp $ Do not install charset.alias, which is already provided by converters/libiconv ---- lib/Makefile.in.orig Sun Aug 21 16:57:37 2011 -+++ lib/Makefile.in Sun Aug 21 16:58:08 2011 -@@ -1470,7 +1470,7 @@ install-exec-localcharset: all-local +--- lib/Makefile.in.orig Thu Sep 15 13:59:54 2011 ++++ lib/Makefile.in Fri Sep 16 21:50:05 2011 +@@ -1561,7 +1561,7 @@ install-exec-localcharset: all-local case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ diff --git a/textproc/wdiff/patches/patch-tests_testsuite b/textproc/wdiff/patches/patch-tests_testsuite new file mode 100644 index 00000000000..1663cfe23a6 --- /dev/null +++ b/textproc/wdiff/patches/patch-tests_testsuite @@ -0,0 +1,18 @@ +$OpenBSD: patch-tests_testsuite,v 1.1 2011/09/17 10:51:22 sthen Exp $ + +no workee with OpenBSD's sed + +--- tests/testsuite.orig Fri Sep 16 22:35:35 2011 ++++ tests/testsuite Fri Sep 16 22:36:05 2011 +@@ -2380,9 +2380,9 @@ $as_echo "wdiff.at:193" >"$at_check_line_file" + # Need to work around a screen bug which might cause the first + # character to be lost: https://savannah.gnu.org/bugs/index.php?34200 + { set +x +-$as_echo "$at_srcdir/wdiff.at:196: sed 's/^ager/Pager/;s/\\r//g;' screenlog.0" ++$as_echo "$at_srcdir/wdiff.at:196: gsed 's/^ager/Pager/;s/\\r//g;' screenlog.0" + at_fn_check_prepare_trace "wdiff.at:196" +-( $at_check_trace; sed 's/^ager/Pager/;s/\r//g;' screenlog.0 ++( $at_check_trace; gsed 's/^ager/Pager/;s/\r//g;' screenlog.0 + ) >>"$at_stdout" 2>>"$at_stderr" + at_status=$? at_failed=false + $at_check_filter diff --git a/textproc/wdiff/pkg/DESCR b/textproc/wdiff/pkg/DESCR index ebe4d71fab0..429d3b4406e 100644 --- a/textproc/wdiff/pkg/DESCR +++ b/textproc/wdiff/pkg/DESCR @@ -1,6 +1,6 @@ -wdiff compares two files, finding which words have been -deleted or added to old_file to get new_file. A word is -anything between whitespace. The output is collected and -used to produce an annotated copy of new_file on standard -output. Suitable annotations produce a nice display of -word differences between the original files. +wdiff is a front end to diff for comparing files on a word per word basis. +A word is anything between whitespace. This is useful for comparing two texts +in which a few words have been changed and for which paragraphs have been +refilled. It works by creating two temporary files, one word per line, and +then executes diff on these files. It collects the diff output and uses it +to produce a nicer display of word differences between the original files. diff --git a/textproc/wdiff/pkg/PLIST b/textproc/wdiff/pkg/PLIST index 01d7be24d94..25f22ef726c 100644 --- a/textproc/wdiff/pkg/PLIST +++ b/textproc/wdiff/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/08/21 16:41:07 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/09/17 10:51:22 sthen Exp $ @bin bin/wdiff @info info/wdiff.info @man man/man1/wdiff.1 @@ -70,6 +70,7 @@ share/locale/sv/LC_MESSAGES/wdiff.mo share/locale/tr/LC_MESSAGES/wdiff-gnulib.mo share/locale/tr/LC_MESSAGES/wdiff.mo share/locale/uk/LC_MESSAGES/wdiff-gnulib.mo +share/locale/uk/LC_MESSAGES/wdiff.mo share/locale/vi/LC_MESSAGES/wdiff-gnulib.mo share/locale/vi/LC_MESSAGES/wdiff.mo share/locale/zh_CN/LC_MESSAGES/wdiff-gnulib.mo