Another update to wdiff. Regress needs screen and gsed (in one case).
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/wdiff/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 21 Aug 2011 16:41:07 -0000 1.25
+++ Makefile 16 Sep 2011 20:39:23 -0000
@@ -2,7 +2,7 @@
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/wdiff/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 21 Aug 2011 16:41:07 -0000 1.5
+++ distinfo 16 Sep 2011 20:39:23 -0000
@@ -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
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/wdiff/patches/patch-lib_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 21 Aug 2011 16:41:07 -0000 1.1
+++ patches/patch-lib_Makefile_in 16 Sep 2011 20:39:23 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-lib_Makefile_in,v 1.1 20
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 ;; \
Index: patches/patch-tests_testsuite
===================================================================
RCS file: patches/patch-tests_testsuite
diff -N patches/patch-tests_testsuite
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_testsuite 16 Sep 2011 20:39:23 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/wdiff/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 21 Aug 2011 16:41:07 -0000 1.6
+++ pkg/PLIST 16 Sep 2011 20:39:23 -0000
@@ -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
