Update to 2.6.1. Changes:

	* graphic.c:
	  If the user tries to print a file that has never been saved, complain.
	* README: Updated maintainer info.
	* README: Updated URL for libraries.
	  Describe use of Print option.
	* Help.txt:
	  Document 'Spline Curve', 'Clone Region', 'Print', and 'Refresh'.
	* snapshot.c: Introduced new "Snapshot" operation (grabbing a
          window or mouse-selected rectangle from screen)
	* Help.txt: updated Help file accordingly
	* graphic.c: Introduced a "Clone region" function
	* splineOP.c: created basic spline curve operations
	* rw/writeTIFF.c: Bug fix; writing TIFF was broken for depth > 8.
	* operation.c: Reorganized order of icons in main control panel
        * graphic.c: Added a "Print" option in the file menu, to the effect
          of calling an external printing utility (xv is a good candidate)

7 files changed, 67 insertions, 83 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 62cd5990308..7b45ca3ae4f 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2001/03/04 09:06:15 tron Exp $
+# $NetBSD: Makefile,v 1.27 2001/03/30 21:44:48 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 
-DISTNAME=       xpaint-2.5.6
+DISTNAME=       xpaint-2.6.1
 WRKSRC=		${WRKDIR}/xpaint
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://home.worldonline.dk/~torsten/xpaint/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://home.worldonline.dk/~torsten/xpaint/
 COMMENT=	Simple paint program
 
@@ -16,6 +16,7 @@ DEPENDS+=	png>1.0.9:../../graphics/png
 
 USE_IMAKE=      YES
 USE_XPM=	YES
+USE_RMAN=	YES
 
 EVAL_PREFIX=	XPMDIR=xpm
 
diff --git a/graphics/xpaint/files/md5 b/graphics/xpaint/files/md5
index 44db07edc7c..9f3712e06e8 100644
--- a/graphics/xpaint/files/md5
+++ b/graphics/xpaint/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/12/20 14:18:02 christos Exp $
+$NetBSD: md5,v 1.4 2001/03/30 21:44:49 hubertf Exp $
 
-MD5 (xpaint-2.5.6.tar.gz) = 16ca24ab07a59ed1a69ef59b7a541f2c
+SHA1 (xpaint-2.6.1.tar.gz) = a26d495bdb4190640756dbbfd214307e92422139
diff --git a/graphics/xpaint/files/patch-sum b/graphics/xpaint/files/patch-sum
index 6741807ff13..2eb8a3f7400 100644
--- a/graphics/xpaint/files/patch-sum
+++ b/graphics/xpaint/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2000/09/01 13:43:38 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/30 21:44:49 hubertf Exp $
 
-MD5 (patch-aa) = aac47e67f9668ea348afea7e20f9d18f
-MD5 (patch-ab) = 57e7f41c130e66f0a63eb36477a2a788
-MD5 (patch-ac) = d70d9cc79f2e481009dc3787408c894a
-MD5 (patch-ad) = fe6b8273bc7c97f4373fcf02538d497f
-MD5 (patch-ae) = 2c09ab74ab156c6b34db36c773119b38
-MD5 (patch-af) = 66a033aa38d2881b49e96ca3c098a979
+SHA1 (patch-aa) = 1c1c2cb9d4cf99d46f6ab8e4247e226d5371d489
+SHA1 (patch-ab) = a0644e605edd5c1769b5b11a6004c4b512960b46
+SHA1 (patch-ac) = dbdf4d975268f3cc9f9d3e8c4526a61505e4d7e5
+SHA1 (patch-ad) = 694cd49256c0dc6330e5538427d69f486de45006
+SHA1 (patch-ae) = daae6772cac1b2ab2fc6b024661f2f22cdee588d
+SHA1 (patch-af) = 715457d4efb5bddcfd956f0c31965fd9602e42f2
diff --git a/graphics/xpaint/patches/patch-aa b/graphics/xpaint/patches/patch-aa
index 389a7272a29..3d402bd1f89 100644
--- a/graphics/xpaint/patches/patch-aa
+++ b/graphics/xpaint/patches/patch-aa
@@ -1,20 +1,13 @@
-$NetBSD: patch-aa,v 1.3 1998/12/20 14:18:02 christos Exp $
-*** misc.h.orig	Tue Jun  9 17:07:47 1998
---- misc.h	Sun Dec 20 09:02:37 1998
-***************
-*** 23,29 ****
-  long random(void);
-  #endif
-  
-! #if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__)
-  #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
-  void srandom(unsigned int);
-  #else
---- 23,29 ----
-  long random(void);
-  #endif
-  
-! #if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) && !defined(__NetBSD__)
-  #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
-  void srandom(unsigned int);
-  #else
+$NetBSD: patch-aa,v 1.4 2001/03/30 21:44:49 hubertf Exp $
+
+--- misc.h.orig	Mon Oct  2 22:56:30 2000
++++ misc.h
+@@ -23,7 +23,7 @@
+ long random(void);
+ #endif
+ 
+-#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
++#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__NetBSD__)
+ #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
+ void srandom(unsigned int);
+ #else
diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab
index cb13f53c6ba..0731cfdda5d 100644
--- a/graphics/xpaint/patches/patch-ab
+++ b/graphics/xpaint/patches/patch-ab
@@ -1,40 +1,29 @@
-$NetBSD: patch-ab,v 1.1 1998/12/20 14:18:02 christos Exp $
-*** rw/libpnmrw.c.orig	Tue Jun  9 17:08:57 1998
---- rw/libpnmrw.c	Sun Dec 20 09:06:23 1998
-***************
-*** 46,52 ****
-  
-  void *malloc(int);
-  void free(void *);
-! #if defined(__EMX__) || defined(__CYGWIN32__)
-  #include <errno.h>
-  #endif
-  
---- 46,52 ----
-  
-  void *malloc(int);
-  void free(void *);
-! #if defined(__EMX__) || defined(__CYGWIN32__) || defined(__NetBSD__)
-  #include <errno.h>
-  #endif
-  
-***************
-*** 131,136 ****
---- 131,137 ----
-  static void
-  pm_perror(char *reason)
-  {
-+ #if !defined(__NetBSD__)
-  #if defined(BSD4_4)
-      __const extern char *__const sys_errlist[];
-  #else
-***************
-*** 140,145 ****
---- 141,147 ----
-  #endif
-  #if !defined(__EMX__) || defined(__CYGWIN32__)
-      extern int errno;
-+ #endif
-  #endif
-      char *e;
-  
+$NetBSD: patch-ab,v 1.2 2001/03/30 21:44:49 hubertf Exp $
+
+--- rw/libpnmrw.c.orig	Mon Oct  2 22:53:30 2000
++++ rw/libpnmrw.c
+@@ -46,7 +46,7 @@
+ 
+ void *malloc(int);
+ void free(void *);
+-#if defined(__EMX__) || defined(__CYGWIN__)
++#if defined(__EMX__) || defined(__CYGWIN__) || defined(__NetBSD__)
+ #include <errno.h>
+ #endif
+ 
+@@ -131,6 +131,7 @@
+ static void
+ pm_perror(char *reason)
+ {
++#if !defined(__NetBSD__)
+ #if defined(BSD4_4)
+     __const extern char *__const sys_errlist[];
+ #else
+@@ -146,6 +147,7 @@
+ #endif
+ #if !defined(__EMX__) || defined(__CYGWIN__)
+     extern int errno;
++#endif
+ #endif
+     char *e;
+ 
diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae
index 4c4cccfe972..ec3491964c0 100644
--- a/graphics/xpaint/patches/patch-ae
+++ b/graphics/xpaint/patches/patch-ae
@@ -1,22 +1,22 @@
-$NetBSD: patch-ae,v 1.1 1999/03/04 17:30:44 tron Exp $
+$NetBSD: patch-ae,v 1.2 2001/03/30 21:44:49 hubertf Exp $
 
---- operation.c.orig	Mon Mar 23 22:39:51 1998
-+++ operation.c	Thu Mar  4 18:27:22 1999
-@@ -909,12 +909,14 @@
+--- operation.c.orig	Sun Sep  3 00:07:08 2000
++++ operation.c
+@@ -940,12 +940,14 @@
  	    fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
      MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1,
  	      fontSet, "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*"),
 -    MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1,
 -	      fontSet, "-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*"),
-+    MI_FLAGCB("Sony 16", MF_CHECK|MF_GROUP1,
-+        fontSet, "-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1"),
-+    MI_FLAGCB("Sony 24", MF_CHECK|MF_GROUP1,
-+        fontSet, "-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1"),
++    MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1,
++	      fontSet, "-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1"),
++    MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1,
++	      fontSet, "-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1"),
      MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1,
  	      fontSet, "-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*"),
-     MI_SEPERATOR(),
+     MI_SEPARATOR(),
 -#define FM_SELECT	11
-+#define FM_SELECT 12
++#define FM_SELECT	12
      MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
  };
  
diff --git a/graphics/xpaint/pkg/PLIST b/graphics/xpaint/pkg/PLIST
index 4bcbfb4359b..93abafa2db8 100644
--- a/graphics/xpaint/pkg/PLIST
+++ b/graphics/xpaint/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1998/02/05 11:44:14 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/30 21:44:49 hubertf Exp $
 bin/xpaint
 man/cat1/xpaint.0.gz
+lib/X11/doc/html/xpaint.1.html
 lib/X11/app-defaults/XPaint