Update to version 2.7.0.

PR:		53285
Submitted by:	Ports Fury

5 files changed, 58 insertions, 68 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index edd225fcb9c1..9e7020ef26ff 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xpaint
-PORTVERSION=	2.6.9
-PORTREVISION=	1
+PORTVERSION=	2.7.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ac-grenoble.fr/Office/
@@ -22,7 +21,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_BZIP2=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
-ALL_TARGET=	xaw
+ALL_TARGET=	xaw95static
 
 MAN1=		xpaint.1
 
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 0f5d72e4f498..7e3efd042dcd 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1 +1 @@
-MD5 (xpaint-2.6.9.tar.bz2) = 74818c986feb79a9bf5d8b82d329fdd4
+MD5 (xpaint-2.7.0.tar.bz2) = 596be813d83922fc4e802bdec19469b3
diff --git a/graphics/xpaint/files/patch-aa b/graphics/xpaint/files/patch-aa
index 4028caea4b0a..80a08fb33c12 100644
--- a/graphics/xpaint/files/patch-aa
+++ b/graphics/xpaint/files/patch-aa
@@ -1,16 +1,14 @@
---- Local.config.orig	Mon Oct 28 17:00:32 2002
-+++ Local.config	Fri Nov  8 23:14:33 2002
-@@ -151,10 +151,13 @@
- #endif
+--- Local.config.orig	Tue Jun  3 21:56:41 2003
++++ Local.config	Thu Jun 12 08:06:54 2003
+@@ -161,9 +161,12 @@
  
  #if defined(FreeBSDArchitecture)
--ARCH_DEFINES = -DHAVE_PARAM_H
+ ARCH_DEFINES = -DHAVE_PARAM_H
 -TIFF_INCLUDE = -I/usr/local/include/tiff34
 -TIFF_LIB     = -L/usr/local/lib -ltiff34
 -JPEG_INCLUDE = -I/usr/local/include
 -JPEG_LIB     = -L/usr/local/lib -ljpeg
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
-+ARCH_DEFINES = -DHAVE_PARAM_H -DHAVE_MKSTEMP
 +TIFF_INCLUDE = -I${LOCALBASE}/include
 +TIFF_LIB     = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ltiff
 +JPEG_INCLUDE = -I${LOCALBASE}/include
diff --git a/graphics/xpaint/files/patch-ae b/graphics/xpaint/files/patch-ae
deleted file mode 100644
index 309411142fcc..000000000000
--- a/graphics/xpaint/files/patch-ae
+++ /dev/null
@@ -1,49 +0,0 @@
---- readRC.c.orig	Sun Oct 27 16:32:36 2002
-+++ readRC.c	Fri Nov  8 22:50:21 2002
-@@ -32,11 +32,13 @@
- #include <unistd.h>
- #endif
- 
-+#ifndef HAVE_MKSTEMP
- #ifdef __STDC__
- extern char *mktemp(char *);
- #else
- extern char *mktemp();
- #endif /* __STDC__ */
-+#endif
- 
- #define RC_FILENAME	".XPaintrc"
- 
-@@ -73,19 +75,32 @@
- static FILE *
- openTemp(char **np)
- {
-+#ifdef HAVE_MKSTEMP
-+    int	fd;
-+#endif
-     char *n;
-     char xx[256];
- 
-     if ((n = getenv("TMPDIR")) == NULL)
-         n = "/tmp";
- 
-+#ifdef HAVE_MKSTEMP
-+    snprintf(xx, 256, "%s/%s", n, "/XPaintXXXXXXX");
-+    fd = mkstemp(xx);
-+    n = xx;
-+#else
-     strcpy(xx, n);
-     strcat(xx, "/XPaint-XXXXXX");
-     n = mktemp(xx);
-+#endif
-     tempName[++tempIndex] = XtNewString(n);
-     if (np != NULL)
-         *np = tempName[tempIndex];
-+#ifdef HAVE_MKSTEMP
-+    return fdopen(fd, "w");
-+#else
-     return fopen(tempName[tempIndex], "w");
-+#endif
- }
- 
- static void 
diff --git a/graphics/xpaint/pkg-plist b/graphics/xpaint/pkg-plist
index 18bb6bd73764..bc8ec99b9873 100644
--- a/graphics/xpaint/pkg-plist
+++ b/graphics/xpaint/pkg-plist
@@ -2,20 +2,62 @@
 bin/xpaint
 lib/X11/app-defaults/XPaint
 lib/X11/app-defaults/XPaint_fr
-lib/X11/xpaint/filters/leftright.c
-lib/X11/xpaint/filters/mapping.c
-lib/X11/xpaint/filters/merge.c
-lib/X11/xpaint/filters/permute.c
-lib/X11/xpaint/filters/rotleft.c
-lib/X11/xpaint/filters/rotright.c
-lib/X11/xpaint/filters/updown.c
+lib/X11/xpaint/XPaintIcon.xpm
+lib/X11/xpaint/c_scripts/3d_curves/helicoid.c
+lib/X11/xpaint/c_scripts/3d_curves/lissajous.c
+lib/X11/xpaint/c_scripts/3d_surfaces/ellipsoid.c
+lib/X11/xpaint/c_scripts/3d_surfaces/heart.c
+lib/X11/xpaint/c_scripts/3d_surfaces/hyperboloid.c
+lib/X11/xpaint/c_scripts/3d_surfaces/polyhedra.c
+lib/X11/xpaint/c_scripts/3d_surfaces/torus.c
+lib/X11/xpaint/c_scripts/3d_surfaces/trefoil.c
+lib/X11/xpaint/c_scripts/3d_surfaces/waves.c
+lib/X11/xpaint/c_scripts/filters/leftright.c
+lib/X11/xpaint/c_scripts/filters/mapping.c
+lib/X11/xpaint/c_scripts/filters/merge.c
+lib/X11/xpaint/c_scripts/filters/permute.c
+lib/X11/xpaint/c_scripts/filters/rotleft.c
+lib/X11/xpaint/c_scripts/filters/rotright.c
+lib/X11/xpaint/c_scripts/filters/updown.c
+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_fr
+lib/X11/xpaint/include/Colormap.h
+lib/X11/xpaint/include/ColormapP.h
+lib/X11/xpaint/include/DefaultRC.txt.h
+lib/X11/xpaint/include/Paint.h
+lib/X11/xpaint/include/PaintP.h
+lib/X11/xpaint/include/XPaint.ad.h
+lib/X11/xpaint/include/Xpaint.h
+lib/X11/xpaint/include/Xpaint3d.h
+lib/X11/xpaint/include/color.h
+lib/X11/xpaint/include/graphic.h
+lib/X11/xpaint/include/hash.h
 lib/X11/xpaint/include/image.h
+lib/X11/xpaint/include/menu.h
+lib/X11/xpaint/include/messages.h
+lib/X11/xpaint/include/misc.h
+lib/X11/xpaint/include/operation.h
+lib/X11/xpaint/include/ops.h
+lib/X11/xpaint/include/palette.h
+lib/X11/xpaint/include/patchlevel.h
+lib/X11/xpaint/include/protocol.h
+lib/X11/xpaint/include/rc.h
+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_fr
 @dirrm lib/X11/xpaint/messages
-@dirrm lib/X11/xpaint/include
 @dirrm lib/X11/xpaint/help
-@dirrm lib/X11/xpaint/filters
+@dirrm lib/X11/xpaint/include
+@dirrm lib/X11/xpaint/c_scripts/procedures
+@dirrm lib/X11/xpaint/c_scripts/layers
+@dirrm lib/X11/xpaint/c_scripts/images
+@dirrm lib/X11/xpaint/c_scripts/filters
+@dirrm lib/X11/xpaint/c_scripts/3d_surfaces
+@dirrm lib/X11/xpaint/c_scripts/3d_curves
+@dirrm lib/X11/xpaint/c_scripts
 @dirrm lib/X11/xpaint