* update to 2.9.1;

* make compile under gcc3.2;
* per-hunk ignore whitespace implemented;
* lines inserted for display purposes now has a cross-hatch pattern to make
  it more obvious;
* minor key binding changes for better interaction with most window managers.

From: Dan Weeks <danimal@danimal.org>

textproc/xxdiff/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2002/07/17 07:27:02 wilfried Exp $
+# $OpenBSD: Makefile,v 1.13 2002/10/16 13:23:41 naddy Exp $
 
 COMMENT=	"graphical file comparator and merge tool"
 
-DISTNAME=	xxdiff-2.6
+DISTNAME=	xxdiff-2.9.1
 CATEGORIES=	textproc x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
 

textproc/xxdiff/distinfo

@@ -1,3 +1,3 @@
-MD5 (xxdiff-2.6.tar.gz) = 45e58050949445123c69874edb2e5642
-RMD160 (xxdiff-2.6.tar.gz) = ee118276847848f6ac860f0650927fdd2e61f696
-SHA1 (xxdiff-2.6.tar.gz) = bf7d0ca22bb34b38c063caac8b2957cdb3d4384f
+MD5 (xxdiff-2.9.1.tar.gz) = d790c8eb3575ffef42d46818094d3c3e
+RMD160 (xxdiff-2.9.1.tar.gz) = b752005952b4a50a602ff1e3baa919f24f170bf9
+SHA1 (xxdiff-2.9.1.tar.gz) = ae6e24b18117d41e36141313b010a0f1019e6107

textproc/xxdiff/patches/patch-app_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-app_cpp,v 1.2 2002/07/17 07:27:02 wilfried Exp $
---- app.cpp.orig	Fri May 31 11:14:25 2002
-+++ app.cpp	Wed Jul 17 09:24:02 2002
-@@ -2160,7 +2160,7 @@ void XxApp::editFile( const QString& fil
+$OpenBSD: patch-app_cpp,v 1.3 2002/10/16 13:23:41 naddy Exp $
+--- app.cpp.orig	Wed Sep 11 01:04:22 2002
++++ app.cpp	Tue Oct 15 21:56:38 2002
+@@ -2182,7 +2182,7 @@ void XxApp::editFile( const QString& fil
        size_t size;
        /* Bind a name to the socket.   */
        name.sun_family = AF_FILE;

textproc/xxdiff/patches/patch-builderDirs2_cpp

@@ -0,0 +1,11 @@
+--- builderDirs2.cpp.orig	Mon Sep 30 10:54:25 2002
++++ builderDirs2.cpp	Mon Sep 30 10:55:01 2002
+@@ -99,6 +99,8 @@ public:
+       const char* buf
+    );
+ 
++   virtual ~XxParseDiffError() throw() { }
++
+ };
+ 
+ /*==============================================================================

textproc/xxdiff/patches/patch-builderFiles2_cpp

@@ -0,0 +1,11 @@
+--- builderFiles2.cpp.orig	Mon Sep 30 11:07:34 2002
++++ builderFiles2.cpp	Mon Sep 30 11:08:04 2002
+@@ -177,6 +177,8 @@ public:
+       const XxFln f2n2 
+    );
+ 
++   virtual ~XxParseDiffError() throw() { }
++
+ };
+ 
+ //------------------------------------------------------------------------------

textproc/xxdiff/patches/patch-builderFiles3_cpp

@@ -0,0 +1,11 @@
+--- builderFiles3.cpp.orig	Mon Sep 30 10:51:54 2002
++++ builderFiles3.cpp	Mon Sep 30 10:52:34 2002
+@@ -79,6 +79,8 @@ public:
+       const XxFln f3n2 
+    );
+ 
++   virtual ~XxParseDiffError() throw() { }
++
+ };
+ 
+ //------------------------------------------------------------------------------

textproc/xxdiff/patches/patch-builderUnmerge_cpp

@@ -0,0 +1,10 @@
+--- builderUnmerge.cpp.orig	Mon Sep 30 10:55:56 2002
++++ builderUnmerge.cpp	Mon Sep 30 10:56:37 2002
+@@ -73,6 +73,7 @@ public:
+       const XxFln f3n2 
+    );
+ 
++   virtual ~XxConflictFormatError() throw() { }
+ };
+ 
+ //------------------------------------------------------------------------------

textproc/xxdiff/patches/patch-exceptions_h

@@ -0,0 +1,28 @@
+--- exceptions.h.orig	Mon Sep 30 10:33:26 2002
++++ exceptions.h	Mon Sep 30 10:40:21 2002
+@@ -118,6 +118,8 @@ public:
+       int            helpMask = 0
+    );
+ 
++   virtual ~XxUsageError() throw() { }
++
+ };
+ 
+ 
+@@ -138,6 +140,8 @@ public:
+       const QString& msg = QString::null // use errno string only.
+    );
+ 
++   virtual ~XxIoError() throw() { }
++
+ };
+ 
+ /*==============================================================================
+@@ -158,6 +162,7 @@ public:
+       XX_EXC_PARAMS_DECL(file,line)
+    );
+ 
++   virtual ~XxInternalError() throw() { }
+ };
+ 
+ 

textproc/xxdiff/patches/patch-getopt_h

@@ -0,0 +1,11 @@
+--- getopt.h.orig	Mon Sep 30 10:43:24 2002
++++ getopt.h	Mon Sep 30 10:47:40 2002
+@@ -127,7 +127,7 @@ struct option
+    `getopt'.  */
+ 
+ #if defined __STDC__ && __STDC__
+-# ifdef __GNU_LIBRARY__
++# if defined __GNU_LIBRARY__ || __OpenBSD__
+ /* Many other libraries have conflicting prototypes for getopt, with
+    differences in the consts, in stdlib.h.  To avoid compilation
+    errors, only prototype getopt for the GNU C library.  */

textproc/xxdiff/patches/patch-xxdiff_1

@@ -1,12 +1,12 @@
-$OpenBSD: patch-xxdiff_1,v 1.2 2002/07/17 07:27:02 wilfried Exp $
+$OpenBSD: patch-xxdiff_1,v 1.3 2002/10/16 13:23:41 naddy Exp $
 --- xxdiff.1.orig	Sat May 18 09:45:01 2002
 +++ xxdiff.1	Wed Jul 17 09:24:02 2002
 @@ -17,7 +17,7 @@
  .\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  .\"
  .na
--.TH XXDIFF 2.1
-+.TH XXDIFF 2.6
+-.TH XXDIFF 2.7
++.TH XXDIFF 2.9.1
  .SH NAME
  xxdiff \- a graphical file comparator and merge tool
  .SH SYNOPSIS