6 files changed, 116 insertions, 15 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 9e7020ef26ff..15c0880a3678 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpaint
-PORTVERSION=	2.7.0
+PORTVERSION=	2.7.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ac-grenoble.fr/Office/
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 8085e3ad1b9c..42d735b1e88c 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,2 +1,2 @@
-MD5 (xpaint-2.7.0.tar.bz2) = 596be813d83922fc4e802bdec19469b3
-SIZE (xpaint-2.7.0.tar.bz2) = 548641
+MD5 (xpaint-2.7.1.tar.bz2) = e7e2f5e97bc56f9242c52ae0cc07fa23
+SIZE (xpaint-2.7.1.tar.bz2) = 603018
diff --git a/graphics/xpaint/files/patch-Imakefile b/graphics/xpaint/files/patch-Imakefile
index 33b1e5519dd7..6b07f21b05e8 100644
--- a/graphics/xpaint/files/patch-Imakefile
+++ b/graphics/xpaint/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- Imakefile.orig	Mon Feb 17 06:31:00 2003
-+++ Imakefile	Sat Apr 19 17:24:17 2003
-@@ -89,7 +89,7 @@
+--- Imakefile.orig	Sun Aug 22 00:15:08 2004
++++ Imakefile	Sat Aug 28 02:46:25 2004
+@@ -90,7 +90,7 @@
  #endif
  
  DEPLIBS = always xpaint.man XPaint.ad
@@ -9,3 +9,12 @@
  
  SUBDIRS = rw
  
+@@ -172,7 +172,7 @@
+ 		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
+ 		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
+ 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
+-	cp -p app-defaults/out/XPaint XPaint.ad
++	cp -f app-defaults/out/XPaint XPaint.ad
+ 
+ XPaint.ad.h:	XPaint.ad
+ 	./substads -ad2c $? $@
diff --git a/graphics/xpaint/files/patch-af b/graphics/xpaint/files/patch-af
index f28d681d3308..7ad2db5c00bb 100644
--- a/graphics/xpaint/files/patch-af
+++ b/graphics/xpaint/files/patch-af
@@ -1,14 +1,5 @@
 --- rw/libpnmrw.c.orig	Wed Oct  4 00:16:52 2000
 +++ rw/libpnmrw.c	Wed Oct  4 00:18:10 2000
-@@ -46,7 +46,7 @@
- 
- void *malloc(int);
- void free(void *);
--#if defined(__EMX__) || defined(__CYGWIN__)
-+#if defined(__EMX__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- #include <errno.h>
- #endif
- 
 @@ -131,6 +131,7 @@
  static void
  pm_perror(char *reason)
diff --git a/graphics/xpaint/files/patch-bitmaps::Imakefile b/graphics/xpaint/files/patch-bitmaps::Imakefile
new file mode 100644
index 000000000000..7ccbf8c98274
--- /dev/null
+++ b/graphics/xpaint/files/patch-bitmaps::Imakefile
@@ -0,0 +1,98 @@
+--- bitmaps/Imakefile.orig	Thu Nov 14 19:09:21 2002
++++ bitmaps/Imakefile	Sat Aug 28 03:01:01 2004
+@@ -1,5 +1,94 @@
+ MISC = Imakefile
+-SRCS = *\/*
++SRCS = \
++	big_tools/arcOp.xpm \
++	big_tools/boxOp.xpm \
++	big_tools/brushOp.xpm \
++	big_tools/clineOp.xpm \
++	big_tools/dotPenOp.xpm \
++	big_tools/dynPenOp.xpm \
++	big_tools/eraseOp.xpm \
++	big_tools/fboxOp.xpm \
++	big_tools/ffillOp.xpm \
++	big_tools/ffreehandOp.xpm \
++	big_tools/fillOp.xpm \
++	big_tools/fovalOp.xpm \
++	big_tools/fpolyOp.xpm \
++	big_tools/freehandOp.xpm \
++	big_tools/fsplineOp.xpm \
++	big_tools/lassoOp.xpm \
++	big_tools/lineOp.xpm \
++	big_tools/ovalOp.xpm \
++	big_tools/pencilOp.xpm \
++	big_tools/polyOp.xpm \
++	big_tools/rayOp.xpm \
++	big_tools/selectOp.xpm \
++	big_tools/selpolyOp.xpm \
++	big_tools/smearOp.xpm \
++	big_tools/splineOp.xpm \
++	big_tools/sprayOp.xpm \
++	big_tools/textOp.xpm \
++	big_tools/tfillOp.xpm \
++	brushes/paintA.xpm \
++	brushes/paintB.xpm \
++	brushes/paintC.xpm \
++	brushes/paintD.xpm \
++	brushes/paintE.xpm \
++	brushes/paintF.xpm \
++	brushes/paintG.xpm \
++	brushes/paintH.xpm \
++	brushes/paintI.xpm \
++	brushes/paintJ.xpm \
++	brushes/paintK.xpm \
++	brushes/paintL.xpm \
++	brushes/paintM.xpm \
++	brushes/paintN.xpm \
++	brushes/paintO.xpm \
++	brushes/paintP.xpm \
++	brushes/paintQ.xpm \
++	brushes/paintR.xpm \
++	brushes/paintS.xpm \
++	brushes/paintT.xpm \
++	small_tools/arcOp.xpm \
++	small_tools/boxOp.xpm \
++	small_tools/brushOp.xpm \
++	small_tools/clineOp.xpm \
++	small_tools/dotPenOp.xpm \
++	small_tools/dynPenOp.xpm \
++	small_tools/eraseOp.xpm \
++	small_tools/fboxOp.xpm \
++	small_tools/ffillOp.xpm \
++	small_tools/ffreehandOp.xpm \
++	small_tools/fillOp.xpm \
++	small_tools/fovalOp.xpm \
++	small_tools/fpolyOp.xpm \
++	small_tools/freehandOp.xpm \
++	small_tools/fsplineOp.xpm \
++	small_tools/lassoOp.xpm \
++	small_tools/lineOp.xpm \
++	small_tools/ovalOp.xpm \
++	small_tools/pencilOp.xpm \
++	small_tools/polyOp.xpm \
++	small_tools/rayOp.xpm \
++	small_tools/selectOp.xpm \
++	small_tools/selpolyOp.xpm \
++	small_tools/smearOp.xpm \
++	small_tools/splineOp.xpm \
++	small_tools/sprayOp.xpm \
++	small_tools/textOp.xpm \
++	small_tools/tfillOp.xpm \
++	xbm/arrows.xbm \
++	xbm/background.xbm \
++	xbm/checkmark.xbm \
++	xbm/defspray.xbm \
++	xbm/pullright.xbm \
++	xbm/wait1.xbm \
++	xbm/wait2.xbm \
++	xbm/wait3.xbm \
++	xbm/wait4.xbm \
++	xpm/eye.xpm \
++	xpm/fill0.xpm \
++	xpm/fill1.xpm \
++	xpm/fill2.xpm
+ 
+ makelist:
+ 	sh -c 'for i in '"$(TEXT) $(SRCS) $(MISC) $(HDRS)"' ; do \
diff --git a/graphics/xpaint/pkg-plist b/graphics/xpaint/pkg-plist
index bc8ec99b9873..af65d3fef9ca 100644
--- a/graphics/xpaint/pkg-plist
+++ b/graphics/xpaint/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/xpaint
 lib/X11/app-defaults/XPaint
+lib/X11/app-defaults/XPaint_es
 lib/X11/app-defaults/XPaint_fr
 lib/X11/xpaint/XPaintIcon.xpm
 lib/X11/xpaint/c_scripts/3d_curves/helicoid.c
@@ -23,6 +24,7 @@ lib/X11/xpaint/c_scripts/images/random.c
 lib/X11/xpaint/c_scripts/layers/combine.c
 lib/X11/xpaint/c_scripts/procedures/setmemory.c
 lib/X11/xpaint/help/Help
+lib/X11/xpaint/help/Help_es
 lib/X11/xpaint/help/Help_fr
 lib/X11/xpaint/include/Colormap.h
 lib/X11/xpaint/include/ColormapP.h
@@ -49,6 +51,7 @@ lib/X11/xpaint/include/region.h
 lib/X11/xpaint/include/text.h
 lib/X11/xpaint/include/xpaint.h
 lib/X11/xpaint/messages/Messages
+lib/X11/xpaint/messages/Messages_es
 lib/X11/xpaint/messages/Messages_fr
 @dirrm lib/X11/xpaint/messages
 @dirrm lib/X11/xpaint/help