Changes 2.7.7:

* Fixes and enhancements

6 files changed, 29 insertions, 29 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 39f513b76b5..8f0a9240942 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2005/05/22 20:08:07 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/05/23 11:37:22 adam Exp $
 
-DISTNAME=       xpaint-2.7.6
+DISTNAME=       xpaint-2.7.7
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 35dac881ce1..27e70e43144 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.13 2005/03/31 11:08:16 adam Exp $
+$NetBSD: distinfo,v 1.14 2005/05/23 11:37:22 adam Exp $
 
-SHA1 (xpaint-2.7.6.tar.bz2) = 7e00fb28ed6b14264c2cef59cd2ea8cf7a7f7ab4
-RMD160 (xpaint-2.7.6.tar.bz2) = 8823b1f266210437647eb360377fe409b912f75b
-Size (xpaint-2.7.6.tar.bz2) = 378529 bytes
+SHA1 (xpaint-2.7.7.tar.bz2) = c7e170af9a75098d2763346268726d33e0a5713b
+RMD160 (xpaint-2.7.7.tar.bz2) = 0edecaaebc04c6adfc11d5883cfafe9ebd7066f6
+Size (xpaint-2.7.7.tar.bz2) = 403208 bytes
 SHA1 (xaw95-1.1.4.tar.bz2) = a40773cb5d7625bc3e86db4aa6c83e6ea44b0bc0
 RMD160 (xaw95-1.1.4.tar.bz2) = 4eb55b64652b829c92411b5271b149f6b9233895
 Size (xaw95-1.1.4.tar.bz2) = 215524 bytes
 SHA1 (patch-aa) = 87ddea42b6497f0c38a56f2915b9896d2858b63d
-SHA1 (patch-ab) = c10aa13fc4c02a6251354360585436d6075981bc
-SHA1 (patch-ac) = e98edf325d9ebe167022b7985b8487f0a08002e6
-SHA1 (patch-ae) = 06c83b24a484841473a477b2bfb049247fd9472d
+SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
+SHA1 (patch-ac) = f84ce15386a2ad3c72279c5534d5597d465dc4f2
+SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
 SHA1 (patch-af) = 2eaa700fa3e56b00e4b5106d1d5efac7377f58d1
-SHA1 (patch-ag) = 11a4b686c9af6dfc4e9d1f3e0b090a43bdf1080b
+SHA1 (patch-ag) = 0a3288a404fed683f33c92860cd5a109476d6a78
 SHA1 (patch-ah) = e9f3ac7e9d4dc21a4a65b862eddc4f3acb21571d
diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab
index 310301867b5..1ceac23eefb 100644
--- a/graphics/xpaint/patches/patch-ab
+++ b/graphics/xpaint/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2004/11/03 15:54:31 adam Exp $
+$NetBSD: patch-ab,v 1.5 2005/05/23 11:37:23 adam Exp $
 
---- rw/libpnmrw.c.orig	2004-09-03 07:49:44.000000000 +0000
+--- rw/libpnmrw.c.orig	2005-05-04 14:56:24.000000000 +0000
 +++ rw/libpnmrw.c
-@@ -131,6 +131,7 @@ pm_freearray(char **its, int rows)
+@@ -132,6 +132,7 @@ pm_freearray(char **its, int rows)
  static void
  pm_perror(char *reason)
  {
@@ -10,9 +10,9 @@ $NetBSD: patch-ab,v 1.4 2004/11/03 15:54:31 adam Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -149,6 +150,7 @@ pm_perror(char *reason)
- #if !defined(__EMX__) || defined(__CYGWIN__)
-     extern int errno;
+@@ -147,6 +148,7 @@ pm_perror(char *reason)
+ #endif
+ #endif
  #endif
 +#endif
      char *e;
diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac
index 691c60fe8a0..d5dd844b834 100644
--- a/graphics/xpaint/patches/patch-ac
+++ b/graphics/xpaint/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/11/03 15:54:31 adam Exp $
+$NetBSD: patch-ac,v 1.7 2005/05/23 11:37:23 adam Exp $
 
---- rw/rwTable.c.orig	2004-09-03 08:27:12.000000000 +0000
+--- rw/rwTable.c.orig	2005-04-10 08:52:02.000000000 +0000
 +++ rw/rwTable.c
-@@ -250,6 +250,7 @@ RWtableGetWriterList()
+@@ -249,6 +249,7 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
@@ -10,10 +10,10 @@ $NetBSD: patch-ac,v 1.6 2004/11/03 15:54:31 adam Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -264,6 +265,7 @@ RWGetMsg()
+@@ -262,6 +263,7 @@ RWGetMsg()
+ #endif
  #endif
  #endif
-     extern int errno;
 +#endif
  
      if (RWtableMsg[0] == '\0') {
diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae
index 30e7b9d0a15..418db4b68fc 100644
--- a/graphics/xpaint/patches/patch-ae
+++ b/graphics/xpaint/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2005/03/31 11:08:16 adam Exp $
+$NetBSD: patch-ae,v 1.7 2005/05/23 11:37:23 adam Exp $
 
---- operation.c.orig	2005-03-21 20:36:37.000000000 +0000
+--- operation.c.orig	2005-05-06 09:46:06.000000000 +0000
 +++ operation.c
-@@ -993,8 +993,10 @@ static PaintMenuItem fontMenu[] =
+@@ -1266,8 +1266,10 @@ static PaintMenuItem fontMenu[] =
  	    fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
      MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1,
  	      fontSet, "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*"),
diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag
index acdc8f1f1a6..6b77bd40970 100644
--- a/graphics/xpaint/patches/patch-ag
+++ b/graphics/xpaint/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2005/03/31 11:08:16 adam Exp $
+$NetBSD: patch-ag,v 1.7 2005/05/23 11:37:23 adam Exp $
 
---- Imakefile.orig	2005-03-20 20:15:32.000000000 +0000
+--- Imakefile.orig	2005-04-27 20:59:37.000000000 +0000
 +++ Imakefile
-@@ -98,7 +98,7 @@ SGI_LIB = -limage
+@@ -102,7 +102,7 @@ SGI_LIB = -limage
  #endif
  
  DEPLIBS = always xpaint.man XPaint.ad
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.6 2005/03/31 11:08:16 adam Exp $
  
  SUBDIRS = rw
  
-@@ -151,7 +151,7 @@ xaw::
+@@ -155,7 +155,7 @@ xaw::
  	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
  	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
  	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.6 2005/03/31 11:08:16 adam Exp $
  	@echo ""
  	@echo "'xpaint' compiled with Xaw widgets (old and ugly)"
  	@echo "You should rather use Xaw3d, neXtaw or Xaw95 !!"	
-@@ -191,12 +191,15 @@ nextaw::
+@@ -195,12 +195,15 @@ nextaw::
  	@echo "Variants are 'make xaw3d' and 'make xaw95'"
  	@echo ""