Use IMAKE_MAN_SUFFIX. Let imake decide where to put the man pages.

Fix errno.

6 files changed, 65 insertions, 16 deletions

diff --git a/graphics/xart/PLIST b/graphics/xart/PLIST
index f78dde96d98..c76b718e3d3 100644
--- a/graphics/xart/PLIST
+++ b/graphics/xart/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/02 19:47:25 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/23 21:24:11 joerg Exp $
 bin/xart
-${IMAKE_MAN_DIR}/xart.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xart.${IMAKE_MAN_SUFFIX}
 lib/X11/app-defaults/XArt
diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo
index 8b6f01b2546..def4c297928 100644
--- a/graphics/xart/distinfo
+++ b/graphics/xart/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:14 agc Exp $
+$NetBSD: distinfo,v 1.9 2006/02/23 21:24:11 joerg Exp $
 
 SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c
 RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f
 Size (xart19980415.tgz) = 343909 bytes
 SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5
 SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9
-SHA1 (patch-ac) = 28d32baa735b55a579a0e12a106621b95f60b2ba
+SHA1 (patch-ac) = e23c8bd13a0731eab0e0c814ebe2cd85f1cd8f37
 SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd
-SHA1 (patch-ae) = 20d847bc9faa0e13bf161041d7fd7a44af73bad1
+SHA1 (patch-ae) = d0d87fe957cbec5979e635270d2ad05b294f7530
 SHA1 (patch-af) = 6bf891c7532f257a18d3e2917353a36ca519221f
 SHA1 (patch-ag) = c764ddf68af02eda1475778e6c1774d751e68a92
 SHA1 (patch-ah) = f888c5167cd8a6111e2064d586ff50984320b210
+SHA1 (patch-ai) = 349170a16199734f35dc56de12e77dd289db412b
+SHA1 (patch-aj) = 919c0c672781a07853322abdc53f93a6964f61a8
diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac
index b842f4ff9bd..74a924a8fb0 100644
--- a/graphics/xart/patches/patch-ac
+++ b/graphics/xart/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2004/04/24 01:15:12 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $
 
 --- Local.config.orig	Wed Apr  1 02:58:05 1998
 +++ Local.config
@@ -54,13 +54,10 @@ $NetBSD: patch-ac,v 1.5 2004/04/24 01:15:12 wiz Exp $
  XCOMM the default paths and man page extension.
  XCOMM
 -XCOMM BINDIR = /usr/local/bin
--XCOMM MANDIR = /usr/local/man
--XCOMM #undef ManSuffix
--XCOMM #define ManSuffix 1
+ XCOMM MANDIR = /usr/local/man
+ XCOMM #undef ManSuffix
+ XCOMM #define ManSuffix 1
 +BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/cat1
-+#undef ManSuffix
-+#define ManSuffix 1
  
  XCOMM Add '-g' here if you want to include debugging information.
  XCOMM Also add any optimizer flags etc. that you want.
diff --git a/graphics/xart/patches/patch-ae b/graphics/xart/patches/patch-ae
index 91408d77339..60d3c2a1e92 100644
--- a/graphics/xart/patches/patch-ae
+++ b/graphics/xart/patches/patch-ae
@@ -1,7 +1,15 @@
-$NetBSD: patch-ae,v 1.1 1999/01/01 03:15:56 garbled Exp $
+$NetBSD: patch-ae,v 1.2 2006/02/23 21:24:12 joerg Exp $
 --- rw/rwTable.c.orig	Thu Dec 31 20:12:10 1998
 +++ rw/rwTable.c	Thu Dec 31 20:13:44 1998
-@@ -231,11 +231,6 @@
+@@ -122,7 +122,6 @@ static char *usedMagicReader = NULL;
+ static Image *
+ readMagic(char *file)
+ {
+-    extern int errno;
+     int i;
+ 
+     errno = 0;
+@@ -231,13 +230,6 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
@@ -10,6 +18,8 @@ $NetBSD: patch-ae,v 1.1 1999/01/01 03:15:56 garbled Exp $
 -#else
 -    extern char *sys_errlist[];
 -#endif
-     extern int errno;
- 
+-    extern int errno;
+-
      if (RWtableMsg[0] == '\0') {
+ 	if (errno == 0)
+ 	    return "";
diff --git a/graphics/xart/patches/patch-ai b/graphics/xart/patches/patch-ai
new file mode 100644
index 00000000000..9e6863aa735
--- /dev/null
+++ b/graphics/xart/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 2006/02/23 21:24:12 joerg Exp $
+
+--- rw/writeGIF.c.orig	2006-02-23 21:14:43.000000000 +0000
++++ rw/writeGIF.c
+@@ -33,6 +33,7 @@
+ ** CompuServe Incorporated.
+  */
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include "image.h"
+ #include "rwTable.h"
+@@ -77,7 +78,6 @@ static Image *image;
+ int
+ WriteGIF(char *file, Image * outImage)
+ {
+-    extern int errno;
+     int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS];
+     int i, bpp;
+     FILE *fp;
diff --git a/graphics/xart/patches/patch-aj b/graphics/xart/patches/patch-aj
new file mode 100644
index 00000000000..526a855dc06
--- /dev/null
+++ b/graphics/xart/patches/patch-aj
@@ -0,0 +1,20 @@
+$NetBSD: patch-aj,v 1.1 2006/02/23 21:24:12 joerg Exp $
+
+--- rw/libpnmrw.c.orig	2006-02-23 21:15:15.000000000 +0000
++++ rw/libpnmrw.c
+@@ -32,6 +32,7 @@
+ /* #define MSDOS */
+ #endif
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include "libpnmrw.h"
+ 
+@@ -133,7 +134,6 @@ pm_perror(char *reason)
+ #else
+     extern char *sys_errlist[];
+ #endif
+-    extern int errno;
+     char *e;
+ 
+     e = sys_errlist[errno];