Changes:

* iprocess.c: added
* graphics.c: implemented new "memory" widget
* bug-fixes (image corruption in PNG; Xaw95; scrollbar)
* PaintRegion.c: added rounding procedure in multiplication of matrices mm()

9 files changed, 122 insertions, 108 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 6badedf9348..13ac5dc13f8 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2003/03/02 19:47:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.36 2003/07/17 09:01:01 adam Exp $
 
-DISTNAME=       xpaint-2.6.7
-PKGREVISION=	1
+DISTNAME=       xpaint-2.7.0
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/xpaint/PLIST b/graphics/xpaint/PLIST
index 535368992a8..b02487b658e 100644
--- a/graphics/xpaint/PLIST
+++ b/graphics/xpaint/PLIST
@@ -1,12 +1,64 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/02 19:47:27 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/07/17 09:01:01 adam Exp $
 bin/xpaint
 ${IMAKE_MAN_DIR}/xpaint.${IMAKE_MANNEWSUFFIX}.gz
 lib/X11/app-defaults/XPaint
 lib/X11/app-defaults/XPaint_fr
+share/xpaint/XPaintIcon.xpm
+share/xpaint/c_scripts/3d_curves/helicoid.c
+share/xpaint/c_scripts/3d_curves/lissajous.c
+share/xpaint/c_scripts/3d_surfaces/ellipsoid.c
+share/xpaint/c_scripts/3d_surfaces/heart.c
+share/xpaint/c_scripts/3d_surfaces/hyperboloid.c
+share/xpaint/c_scripts/3d_surfaces/polyhedra.c
+share/xpaint/c_scripts/3d_surfaces/torus.c
+share/xpaint/c_scripts/3d_surfaces/trefoil.c
+share/xpaint/c_scripts/3d_surfaces/waves.c
+share/xpaint/c_scripts/filters/leftright.c
+share/xpaint/c_scripts/filters/mapping.c
+share/xpaint/c_scripts/filters/merge.c
+share/xpaint/c_scripts/filters/permute.c
+share/xpaint/c_scripts/filters/rotleft.c
+share/xpaint/c_scripts/filters/rotright.c
+share/xpaint/c_scripts/filters/updown.c
+share/xpaint/c_scripts/images/random.c
+share/xpaint/c_scripts/layers/combine.c
+share/xpaint/c_scripts/procedures/setmemory.c
 share/xpaint/help/Help
 share/xpaint/help/Help_fr
+share/xpaint/include/Colormap.h
+share/xpaint/include/ColormapP.h
+share/xpaint/include/DefaultRC.txt.h
+share/xpaint/include/Paint.h
+share/xpaint/include/PaintP.h
+share/xpaint/include/XPaint.ad.h
+share/xpaint/include/Xpaint.h
+share/xpaint/include/Xpaint3d.h
+share/xpaint/include/color.h
+share/xpaint/include/graphic.h
+share/xpaint/include/hash.h
+share/xpaint/include/image.h
+share/xpaint/include/menu.h
+share/xpaint/include/messages.h
+share/xpaint/include/misc.h
+share/xpaint/include/operation.h
+share/xpaint/include/ops.h
+share/xpaint/include/palette.h
+share/xpaint/include/patchlevel.h
+share/xpaint/include/protocol.h
+share/xpaint/include/rc.h
+share/xpaint/include/region.h
+share/xpaint/include/text.h
+share/xpaint/include/xpaint.h
 share/xpaint/messages/Messages
 share/xpaint/messages/Messages_fr
 @dirrm share/xpaint/messages
+@dirrm share/xpaint/include
 @dirrm share/xpaint/help
+@dirrm share/xpaint/c_scripts/procedures
+@dirrm share/xpaint/c_scripts/layers
+@dirrm share/xpaint/c_scripts/images
+@dirrm share/xpaint/c_scripts/filters
+@dirrm share/xpaint/c_scripts/3d_surfaces
+@dirrm share/xpaint/c_scripts/3d_curves
+@dirrm share/xpaint/c_scripts
 @dirrm share/xpaint
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 437d0eccf72..bc0b56c6d5f 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/03/17 01:19:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2003/07/17 09:01:01 adam Exp $
 
-SHA1 (xpaint-2.6.7.tar.bz2) = d45948c8ee368ad936a3ea0e6081f6d1d3756852
-Size (xpaint-2.6.7.tar.bz2) = 502319 bytes
+SHA1 (xpaint-2.7.0.tar.bz2) = 9a718e279d15b043f4763a29a552f7cf609bb80e
+Size (xpaint-2.7.0.tar.bz2) = 548641 bytes
 SHA1 (patch-aa) = 1c1c2cb9d4cf99d46f6ab8e4247e226d5371d489
-SHA1 (patch-ab) = a0644e605edd5c1769b5b11a6004c4b512960b46
-SHA1 (patch-ac) = dbdf4d975268f3cc9f9d3e8c4526a61505e4d7e5
-SHA1 (patch-ad) = c4a4df43dbde8ec2c42c39c49df99d8110eb8007
-SHA1 (patch-ae) = 36895e2e3da56a15087e6b8b155b71df20fdc1d3
-SHA1 (patch-af) = 7758d2ec39a599cdb51bfeced3b068c94b0daec2
-SHA1 (patch-ag) = 3cfdfe9885ed4fb2bb08885c29c6365c7a191814
+SHA1 (patch-ab) = 37e778cba2875691d5e411ae57374c47cee43bf6
+SHA1 (patch-ac) = 9bfad6abed6f1547eaa77c1cd98fdc4006f9474b
+SHA1 (patch-ae) = 9d45899230246b8651c2c9061fdbb47b09b7e489
+SHA1 (patch-af) = 2bf7c952d8cc8cc3d17c300d94541fc371e7d129
+SHA1 (patch-ag) = 5a9752c48f9b9b7ea2c73875202299ecf0b7d395
diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab
index 0731cfdda5d..1b512625c21 100644
--- a/graphics/xpaint/patches/patch-ab
+++ b/graphics/xpaint/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/03/30 21:44:49 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2003/07/17 09:01:02 adam Exp $
 
---- rw/libpnmrw.c.orig	Mon Oct  2 22:53:30 2000
-+++ rw/libpnmrw.c
-@@ -46,7 +46,7 @@
+--- rw/libpnmrw.c.orig	2002-12-15 11:41:26.000000000 +0100
++++ rw/libpnmrw.c	2003-07-17 09:43:18.000000000 +0200
+@@ -49,7 +49,7 @@
  
  void *malloc(int);
  void free(void *);
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2001/03/30 21:44:49 hubertf Exp $
  #include <errno.h>
  #endif
  
-@@ -131,6 +131,7 @@
+@@ -134,6 +134,7 @@
  static void
  pm_perror(char *reason)
  {
@@ -19,11 +19,11 @@ $NetBSD: patch-ab,v 1.2 2001/03/30 21:44:49 hubertf Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -146,6 +147,7 @@
- #endif
+@@ -150,6 +151,7 @@
  #if !defined(__EMX__) || defined(__CYGWIN__)
      extern int errno;
-+#endif
  #endif
++#endif
      char *e;
  
+     e = (char *)sys_errlist[errno];
diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac
index 2335a347653..4ab62f51ee3 100644
--- a/graphics/xpaint/patches/patch-ac
+++ b/graphics/xpaint/patches/patch-ac
@@ -1,23 +1,20 @@
-$NetBSD: patch-ac,v 1.4 1998/12/20 14:18:02 christos Exp $
-*** rw/rwTable.c.orig	Tue Jun  9 17:09:32 1998
---- rw/rwTable.c	Sat Dec 19 13:57:15 1998
-***************
-*** 231,236 ****
---- 231,237 ----
-  char *
-  RWGetMsg()
-  {
-+ #ifndef __NetBSD__
-  #if defined(BSD4_4)
-      __const extern char *__const sys_errlist[];
-  #else
-***************
-*** 239,244 ****
---- 240,246 ----
-  #endif
-  #endif
-      extern int errno;
-+ #endif
-  
-      if (RWtableMsg[0] == '\0') {
-  	if (errno == 0)
+$NetBSD: patch-ac,v 1.5 2003/07/17 09:01:02 adam Exp $
+
+--- rw/rwTable.c.orig	2003-04-12 22:41:40.000000000 +0200
++++ rw/rwTable.c	2003-07-17 09:43:42.000000000 +0200
+@@ -246,6 +246,7 @@
+ char *
+ RWGetMsg()
+ {
++#ifndef __NetBSD__
+ #if defined(BSD4_4)
+     __const extern char *__const sys_errlist[];
+ #else
+@@ -260,6 +261,7 @@
+ #endif
+ #endif
+     extern int errno;
++#endif
+ 
+     if (RWtableMsg[0] == '\0') {
+ 	if (errno == 0)
diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad
deleted file mode 100644
index 20b7ae5e065..00000000000
--- a/graphics/xpaint/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/12/16 09:29:13 tron Exp $
-
---- readRC.c.orig	Sun Nov 24 15:53:30 2002
-+++ readRC.c	Sun Dec 15 18:58:00 2002
-@@ -75,6 +75,10 @@
- static FILE *
- openTemp(char **np)
- {
-+#ifdef __NetBSD__
-+    int	fd;
-+    FILE *f;
-+#endif
-     char *n;
-     char xx[256];
- 
-@@ -83,11 +87,23 @@
- 
-     strcpy(xx, n);
-     strcat(xx, "/XPaint-XXXXXX");
-+#ifdef __NetBSD__
-+    if ((fd = mkstemp(xx)) < 0)
-+           return NULL;
-+    tempName[++tempIndex] = XtNewString(xx);
-+    if (np != NULL)
-+       *np = tempName[tempIndex];
-+    f = fdopen(fd, "w");
-+    if (f == NULL)
-+       (void) close(fd);
-+    return f;
-+#else
-     n = mktemp(xx);
-     tempName[++tempIndex] = XtNewString(n);
-     if (np != NULL)
-         *np = tempName[tempIndex];
-     return fopen(tempName[tempIndex], "w");
-+#endif
- }
- 
- static void 
diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae
index 84837e3a88f..4a9d436d6ec 100644
--- a/graphics/xpaint/patches/patch-ae
+++ b/graphics/xpaint/patches/patch-ae
@@ -1,13 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2002/12/16 09:29:13 tron Exp $
+$NetBSD: patch-ae,v 1.4 2003/07/17 09:01:02 adam Exp $
 
---- operation.c.orig	Sat Nov 23 12:02:08 2002
-+++ operation.c	Sun Dec 15 23:09:43 2002
-@@ -928,11 +928,13 @@
-     MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1,
- 	      fontSet, "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*"),
-     MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1,
--	    fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
-+	      fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
+--- operation.c.orig	2003-03-10 21:56:30.000000000 +0100
++++ operation.c	2003-07-17 09:44:40.000000000 +0200
+@@ -992,8 +992,10 @@
+ 	    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,
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index c479edcde41..75012c81894 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,16 +1,17 @@
-$NetBSD: patch-af,v 1.7 2002/12/16 09:32:01 tron Exp $
+$NetBSD: patch-af,v 1.8 2003/07/17 09:01:02 adam Exp $
 
---- Local.config.orig	Sun Nov 17 22:18:23 2002
-+++ Local.config	Mon Dec 16 10:06:50 2002
-@@ -8,6 +8,6 @@
- 
+--- Local.config.orig	2003-06-03 14:56:41.000000000 +0200
++++ Local.config	2003-07-17 09:51:15.000000000 +0200
+@@ -9,7 +9,7 @@
  XCOMM Local customization
+ 
+ DESTDIR = 
 -SHAREDIR = /usr/share/xpaint
 +SHAREDIR = $${X11PREFIX}/share/xpaint
- PRINT_COMMAND = lpr -Plocal
- POSTSCRIPT_VIEWER = gv
- EXTERN_VIEWER = xv
-@@ -54,6 +54,9 @@
+ 
+ PRINT_COMMAND = lpr -Plp
+ EDITOR = emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black
+@@ -58,6 +58,9 @@
  
  #ifdef NetBSDArchitecture
  ARCH_DEFINES = -DHAVE_PARAM_H  
@@ -20,7 +21,7 @@ $NetBSD: patch-af,v 1.7 2002/12/16 09:32:01 tron Exp $
  #endif
  
  #ifdef OS2Architecture
-@@ -116,11 +119,11 @@
+@@ -120,11 +123,11 @@
  XCOMM  You must have the XPM library.
  XCOMM  Make sure the path name to the library is correct.
  
@@ -34,7 +35,7 @@ $NetBSD: patch-af,v 1.7 2002/12/16 09:32:01 tron Exp $
  
  
  DEPENDFLAGS = -I./bitmaps
-@@ -146,14 +149,14 @@
+@@ -150,14 +153,14 @@
  
  XCOMM This should take care of everything needed for BSD.
  
diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag
index f21a48fdf46..f86d849b94b 100644
--- a/graphics/xpaint/patches/patch-ag
+++ b/graphics/xpaint/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.2 2003/03/17 01:19:12 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $
 
---- Imakefile.orig	Sun Nov 17 22:16:53 2002
-+++ Imakefile	Mon Dec 16 10:20:41 2002
-@@ -114,10 +114,10 @@
+--- Imakefile.orig	2003-06-11 15:44:30.000000000 +0200
++++ Imakefile	2003-07-17 10:43:28.000000000 +0200
+@@ -89,7 +89,7 @@
+ #endif
+ 
+ DEPLIBS = always xpaint.man XPaint.ad
+-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
++LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
+ 
+ SUBDIRS = rw
+ 
+@@ -124,10 +124,10 @@
  xaw::
  	-$(RM) $(XAW95DEPENDS)
  	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
@@ -15,7 +24,7 @@ $NetBSD: patch-ag,v 1.2 2003/03/17 01:19:12 dmcmahill Exp $
  	-$(RM) libXaw95.so libXaw95.a
  	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
  	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
-@@ -128,13 +128,13 @@
+@@ -138,13 +138,13 @@
  	-$(RM) $(XAW95DEPENDS)
  	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
  	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs