Changes 2.7.2:

* Added .bmp format
* Support for .ico format with 24 and 32 bits per pixel
* Now opens a confirmation dialog in case a file is going to be overwritten
* Improved printer management

8 files changed, 45 insertions, 52 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 678950e7b5f..4e495f790c4 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2004/10/03 00:14:58 tv Exp $
+# $NetBSD: Makefile,v 1.41 2004/11/03 15:54:31 adam Exp $
 
-DISTNAME=       xpaint-2.7.0
-PKGREVISION=	2
+DISTNAME=       xpaint-2.7.2
 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 b02487b658e..c1329f88da7 100644
--- a/graphics/xpaint/PLIST
+++ b/graphics/xpaint/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/17 09:01:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/03 15:54:31 adam Exp $
 bin/xpaint
 ${IMAKE_MAN_DIR}/xpaint.${IMAKE_MANNEWSUFFIX}.gz
 lib/X11/app-defaults/XPaint
+lib/X11/app-defaults/XPaint_es
 lib/X11/app-defaults/XPaint_fr
 share/xpaint/XPaintIcon.xpm
 share/xpaint/c_scripts/3d_curves/helicoid.c
@@ -24,6 +25,7 @@ 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_es
 share/xpaint/help/Help_fr
 share/xpaint/include/Colormap.h
 share/xpaint/include/ColormapP.h
@@ -50,6 +52,7 @@ share/xpaint/include/region.h
 share/xpaint/include/text.h
 share/xpaint/include/xpaint.h
 share/xpaint/messages/Messages
+share/xpaint/messages/Messages_es
 share/xpaint/messages/Messages_fr
 @dirrm share/xpaint/messages
 @dirrm share/xpaint/include
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index ac3079e3f49..c20276a5867 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/03/20 22:30:36 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2004/11/03 15:54:31 adam Exp $
 
-SHA1 (xpaint-2.7.0.tar.bz2) = 9a718e279d15b043f4763a29a552f7cf609bb80e
-Size (xpaint-2.7.0.tar.bz2) = 548641 bytes
+SHA1 (xpaint-2.7.2.tar.bz2) = 200f1a02b8d4917f6d0ca212caecc1ffa7194c21
+Size (xpaint-2.7.2.tar.bz2) = 609645 bytes
 SHA1 (patch-aa) = 1c1c2cb9d4cf99d46f6ab8e4247e226d5371d489
-SHA1 (patch-ab) = 37e778cba2875691d5e411ae57374c47cee43bf6
-SHA1 (patch-ac) = 9bfad6abed6f1547eaa77c1cd98fdc4006f9474b
-SHA1 (patch-ae) = 9d45899230246b8651c2c9061fdbb47b09b7e489
-SHA1 (patch-af) = 2bf7c952d8cc8cc3d17c300d94541fc371e7d129
-SHA1 (patch-ag) = 0e6745ab4069f0532f20e193f151b5d5ea68fb3a
+SHA1 (patch-ab) = c10aa13fc4c02a6251354360585436d6075981bc
+SHA1 (patch-ac) = e98edf325d9ebe167022b7985b8487f0a08002e6
+SHA1 (patch-ae) = d7d903409ae8fe34ca7c64caac85d2211292134d
+SHA1 (patch-af) = 2eaa700fa3e56b00e4b5106d1d5efac7377f58d1
+SHA1 (patch-ag) = b7518174030fe951d2d00437efef8550d5cb9cc7
 SHA1 (patch-ah) = aa49732f29be3fb96d212c5b2e4e6cd3d9be4fc5
diff --git a/graphics/xpaint/patches/patch-ab b/graphics/xpaint/patches/patch-ab
index 1b512625c21..310301867b5 100644
--- a/graphics/xpaint/patches/patch-ab
+++ b/graphics/xpaint/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/07/17 09:01:02 adam Exp $
+$NetBSD: patch-ab,v 1.4 2004/11/03 15:54:31 adam Exp $
 
---- 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 *);
--#if defined(__EMX__) || defined(__CYGWIN__)
-+#if defined(__EMX__) || defined(__CYGWIN__) || defined(__NetBSD__)
- #include <errno.h>
- #endif
- 
-@@ -134,6 +134,7 @@
+--- rw/libpnmrw.c.orig	2004-09-03 07:49:44.000000000 +0000
++++ rw/libpnmrw.c
+@@ -131,6 +131,7 @@ pm_freearray(char **its, int rows)
  static void
  pm_perror(char *reason)
  {
@@ -19,11 +10,11 @@ $NetBSD: patch-ab,v 1.3 2003/07/17 09:01:02 adam Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -150,6 +151,7 @@
+@@ -149,6 +150,7 @@ pm_perror(char *reason)
  #if !defined(__EMX__) || defined(__CYGWIN__)
      extern int errno;
  #endif
 +#endif
      char *e;
  
-     e = (char *)sys_errlist[errno];
+ #ifdef MISSING_STRERROR
diff --git a/graphics/xpaint/patches/patch-ac b/graphics/xpaint/patches/patch-ac
index 4ab62f51ee3..691c60fe8a0 100644
--- a/graphics/xpaint/patches/patch-ac
+++ b/graphics/xpaint/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2003/07/17 09:01:02 adam Exp $
+$NetBSD: patch-ac,v 1.6 2004/11/03 15:54:31 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 @@
+--- rw/rwTable.c.orig	2004-09-03 08:27:12.000000000 +0000
++++ rw/rwTable.c
+@@ -250,6 +250,7 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/17 09:01:02 adam Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -260,6 +261,7 @@
+@@ -264,6 +265,7 @@ RWGetMsg()
  #endif
  #endif
      extern int errno;
diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae
index 4a9d436d6ec..ae41b12e9ff 100644
--- a/graphics/xpaint/patches/patch-ae
+++ b/graphics/xpaint/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2003/07/17 09:01:02 adam Exp $
+$NetBSD: patch-ae,v 1.5 2004/11/03 15:54:31 adam Exp $
 
---- 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 @@
+--- operation.c.orig	2003-07-24 20:30:56.000000000 +0000
++++ operation.c
+@@ -993,8 +993,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-af b/graphics/xpaint/patches/patch-af
index 75012c81894..3616e1e264e 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.8 2003/07/17 09:01:02 adam Exp $
+$NetBSD: patch-af,v 1.9 2004/11/03 15:54:31 adam Exp $
 
---- 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 @@
+--- Local.config.orig	2004-09-05 08:14:53.000000000 +0000
++++ Local.config
+@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.29 2004/09/0
  XCOMM Local customization
  
  DESTDIR = 
 -SHAREDIR = /usr/share/xpaint
 +SHAREDIR = $${X11PREFIX}/share/xpaint
  
- PRINT_COMMAND = lpr -Plp
- EDITOR = emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black
-@@ -58,6 +58,9 @@
+ XCOMM Printing system defaults
+ PRINT_COMMAND = lpr
+@@ -70,6 +70,9 @@ XCOMM #endif
  
  #ifdef NetBSDArchitecture
  ARCH_DEFINES = -DHAVE_PARAM_H  
@@ -21,7 +21,7 @@ $NetBSD: patch-af,v 1.8 2003/07/17 09:01:02 adam Exp $
  #endif
  
  #ifdef OS2Architecture
-@@ -120,11 +123,11 @@
+@@ -132,11 +135,11 @@ XCOMM
  XCOMM  You must have the XPM library.
  XCOMM  Make sure the path name to the library is correct.
  
@@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.8 2003/07/17 09:01:02 adam Exp $
  
  
  DEPENDFLAGS = -I./bitmaps
-@@ -150,14 +153,14 @@
+@@ -162,14 +165,14 @@ XCOMM CDEBUGFLAGS =
  
  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 29a448df58b..78c7058ef79 100644
--- a/graphics/xpaint/patches/patch-ag
+++ b/graphics/xpaint/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2004/03/20 22:30:36 bouyer Exp $
+$NetBSD: patch-ag,v 1.5 2004/11/03 15:54:31 adam Exp $
 
---- Imakefile.orig	Wed Jun 11 15:44:30 2003
-+++ Imakefile	Tue Oct 21 23:48:47 2003
-@@ -89,7 +89,7 @@
+--- Imakefile.orig	2004-09-03 07:19:00.000000000 +0000
++++ Imakefile
+@@ -97,7 +97,7 @@ SGI_LIB = -limage
  #endif
  
  DEPLIBS = always xpaint.man XPaint.ad
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.4 2004/03/20 22:30:36 bouyer Exp $
  
  SUBDIRS = rw
  
-@@ -124,10 +124,10 @@
+@@ -133,10 +133,10 @@ install::
  xaw::
  	-$(RM) $(XAW95DEPENDS)
  	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
@@ -24,7 +24,7 @@ $NetBSD: patch-ag,v 1.4 2004/03/20 22:30:36 bouyer Exp $
  	-$(RM) libXaw95.so libXaw95.a
  	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
  	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
-@@ -138,13 +138,13 @@
+@@ -147,13 +147,13 @@ xaw95:: libXaw95.so
  	-$(RM) $(XAW95DEPENDS)
  	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
  	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
@@ -41,7 +41,7 @@ $NetBSD: patch-ag,v 1.4 2004/03/20 22:30:36 bouyer Exp $
  
  clean::
  	-$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*
-@@ -153,7 +153,7 @@
+@@ -162,7 +162,7 @@ clean::
  	cd share/messages ; $(RM) *~
  	cd app-defaults ; $(RM) core *~ substads
  	cd app-defaults/out ; $(RM) -f Xpaint*