Upgrade to 2.5.6

6 files changed, 88 insertions, 99 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 18766823a46..8cd3e2f0c3c 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:03 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1998/12/20 14:18:01 christos Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
-DISTNAME=       xpaint-2.5
+DISTNAME=       xpaint-2.5.6
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://www.danbbs.dk/~torsten/xpaint/
 
diff --git a/graphics/xpaint/files/md5 b/graphics/xpaint/files/md5
index 57b602fe015..44db07edc7c 100644
--- a/graphics/xpaint/files/md5
+++ b/graphics/xpaint/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:38 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/20 14:18:02 christos Exp $
 
-MD5 (xpaint-2.5.tar.gz) = 62438af07c1b7ed777c57be35b7db2a3
+MD5 (xpaint-2.5.6.tar.gz) = 16ca24ab07a59ed1a69ef59b7a541f2c
diff --git a/graphics/xpaint/patches/patch-aa b/graphics/xpaint/patches/patch-aa
index aa891df9cfb..389a7272a29 100644
--- a/graphics/xpaint/patches/patch-aa
+++ b/graphics/xpaint/patches/patch-aa
@@ -1,65 +1,20 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:55 agc Exp $
-
---- operation.c.orig	Wed Aug 13 21:45:28 1997
-+++ operation.c	Fri Aug 29 13:47:20 1997
-@@ -43,34 +43,34 @@
- #include "cutCopyPaste.h"
- 
- /* Pixmaps for toolbox icons */
--#include "brushOp.xpm"
--#include "eraseOp.xpm"
--#include "sprayOp.xpm"
--#include "pencilOp.xpm"
--#include "dotPenOp.xpm"
--#include "dynPenOp.xpm"
--#include "lineOp.xpm"
--#include "arcOp.xpm"
--#include "fillOp.xpm"
--#include "tfillOp.xpm"
-+#include "bitmaps/brushOp.xpm"
-+#include "bitmaps/eraseOp.xpm"
-+#include "bitmaps/sprayOp.xpm"
-+#include "bitmaps/pencilOp.xpm"
-+#include "bitmaps/dotPenOp.xpm"
-+#include "bitmaps/dynPenOp.xpm"
-+#include "bitmaps/lineOp.xpm"
-+#include "bitmaps/arcOp.xpm"
-+#include "bitmaps/fillOp.xpm"
-+#include "bitmaps/tfillOp.xpm"
- #ifdef FEATURE_FRACTAL
--#include "ffillOp.xpm"
-+#include "bitmaps/ffillOp.xpm"
- #endif
--#include "smearOp.xpm"
--#include "textOp.xpm"
--#include "selectOp.xpm"
--#include "boxOp.xpm"
--#include "rayOp.xpm"
--#include "fboxOp.xpm"
--#include "ovalOp.xpm"
--#include "fovalOp.xpm"
--#include "lassoOp.xpm"
--#include "clineOp.xpm"
--#include "polyOp.xpm"
--#include "fpolyOp.xpm"
--#include "freehandOp.xpm"
--#include "ffreehandOp.xpm"
--#include "selpolyOp.xpm"
-+#include "bitmaps/smearOp.xpm"
-+#include "bitmaps/textOp.xpm"
-+#include "bitmaps/selectOp.xpm"
-+#include "bitmaps/boxOp.xpm"
-+#include "bitmaps/rayOp.xpm"
-+#include "bitmaps/fboxOp.xpm"
-+#include "bitmaps/ovalOp.xpm"
-+#include "bitmaps/fovalOp.xpm"
-+#include "bitmaps/lassoOp.xpm"
-+#include "bitmaps/clineOp.xpm"
-+#include "bitmaps/polyOp.xpm"
-+#include "bitmaps/fpolyOp.xpm"
-+#include "bitmaps/freehandOp.xpm"
-+#include "bitmaps/ffreehandOp.xpm"
-+#include "bitmaps/selpolyOp.xpm"
- 
- 
- 
+$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
diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab
new file mode 100644
index 00000000000..cb13f53c6ba
--- /dev/null
+++ b/graphics/xpaint/patches/patch-ab
@@ -0,0 +1,40 @@
+$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;
+  
diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac
index 8e2988daec6..2335a347653 100644
--- a/graphics/xpaint/patches/patch-ac
+++ b/graphics/xpaint/patches/patch-ac
@@ -1,14 +1,23 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 10:40:55 agc Exp $
-
---- ./misc.h.org	Tue Jun 25 01:50:41 1996
-+++ ./misc.h	Tue Mar 25 18:20:30 1997
-@@ -23,7 +23,9 @@
- 
- #ifndef linux
- #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- void srandom(unsigned int);
-+#endif
- #else
- int srandom(unsigned int);
- #endif	/* BSD4_4 */
+$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)
diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad
index b02e2102ef8..454cbb1669d 100644
--- a/graphics/xpaint/patches/patch-ad
+++ b/graphics/xpaint/patches/patch-ad
@@ -1,19 +1,4 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 10:40:55 agc Exp $
-
---- dynPenOp.c.orig	Wed Aug 13 16:10:00 1997
-+++ dynPenOp.c	Fri Aug 29 14:08:48 1997
-@@ -28,6 +28,11 @@
- #include "misc.h"
- #include "Paint.h"
- 
-+#ifndef HZ
-+#include <time.h>
-+#define HZ CLK_TCK
-+#endif
-+
- #define XTIMEOUT ((unsigned long)(1.5*1000/HZ)) /* ms, should be larger than 1000/HZ */
- 
- typedef struct {
+$NetBSD: patch-ad,v 1.4 1998/12/20 14:18:02 christos Exp $
 --- readRC.c	1998/02/04 16:36:16	1.1
 +++ readRC.c	1998/02/04 16:41:52
 @@ -64,6 +64,9 @@