Update "xpaint" package to version 2.6.7. This version fixes several bugs

found since version 2.6.2, adds several new features including french
language support and has a Xaw95 based user interface.

7 files changed, 99 insertions, 51 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 9e3e17b28b0..143ecf2ef8a 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,35 +1,29 @@
-# $NetBSD: Makefile,v 1.33 2002/10/21 12:26:29 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.34 2002/12/16 09:29:12 tron Exp $
 
-DISTNAME=       xpaint-2.6.2
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xpaint
+DISTNAME=       xpaint-2.6.7
 CATEGORIES=	graphics x11
-MASTER_SITES=	http://home.worldonline.dk/~torsten/xpaint/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://home.worldonline.dk/~torsten/xpaint/
+HOMEPAGE=	http://sf-xpaint.sourceforge.net/
 COMMENT=	Simple paint program
 
 USE_BUILDLINK2=	YES
 USE_IMAKE=      YES
 USE_RMAN=	YES
+USE_X11BASE=	YES
 
-PLIST_SRC=	${WRKDIR}/PLIST
+ALL_TARGET=	xaw95static
+MAKE_ENV+=	XMKMF="${XMKMF}"
 
 pre-configure:
 	${MV} -f ${WRKSRC}/Local.config ${WRKSRC}/Local.config.save
-	@${SED} -e 's|\$${LOCALBASE}|${LOCALBASE}|g' \
+	${SED} -e 's|\$${LOCALBASE}|${LOCALBASE}|g' \
 		-e 's|\$${X11BASE}|${X11BASE}|g' \
 		-e 's|\$${XPMDIR}|${BUILDLINK_PREFIX.xpm}|g' \
 		${WRKSRC}/Local.config.save > ${WRKSRC}/Local.config
 
-post-install:
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	if [ -f  ${PREFIX}/lib/X11/doc/html/xpaint.1.html ]; then \
-	  ${ECHO} lib/X11/doc/html/xpaint.1.html >>${PLIST_SRC}; \
-	fi
-
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
diff --git a/graphics/xpaint/PLIST b/graphics/xpaint/PLIST
index 3987f0b543b..d766947ecdc 100644
--- a/graphics/xpaint/PLIST
+++ b/graphics/xpaint/PLIST
@@ -1,4 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:44 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/16 09:29:12 tron Exp $
 bin/xpaint
 man/cat1/xpaint.0.gz
 lib/X11/app-defaults/XPaint
+lib/X11/app-defaults/XPaint_fr
+share/xpaint/help/Help
+share/xpaint/help/Help_fr
+share/xpaint/messages/Messages
+share/xpaint/messages/Messages_fr
+@dirrm share/xpaint/messages
+@dirrm share/xpaint/help
+@dirrm share/xpaint
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 070357fe889..d81030330ce 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/10/26 19:43:45 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2002/12/16 09:29:12 tron Exp $
 
-SHA1 (xpaint-2.6.2.tar.gz) = 33afbb8360e9654fc1ddb04dc739388d3b8584c5
-Size (xpaint-2.6.2.tar.gz) = 265319 bytes
+SHA1 (xpaint-2.6.7.tar.bz2) = d45948c8ee368ad936a3ea0e6081f6d1d3756852
+Size (xpaint-2.6.7.tar.bz2) = 502319 bytes
 SHA1 (patch-aa) = 1c1c2cb9d4cf99d46f6ab8e4247e226d5371d489
 SHA1 (patch-ab) = a0644e605edd5c1769b5b11a6004c4b512960b46
 SHA1 (patch-ac) = dbdf4d975268f3cc9f9d3e8c4526a61505e4d7e5
-SHA1 (patch-ad) = 694cd49256c0dc6330e5538427d69f486de45006
-SHA1 (patch-ae) = daae6772cac1b2ab2fc6b024661f2f22cdee588d
-SHA1 (patch-af) = df0ab99a312e1d982bf16a90adf3776c734fb8ed
+SHA1 (patch-ad) = c4a4df43dbde8ec2c42c39c49df99d8110eb8007
+SHA1 (patch-ae) = 36895e2e3da56a15087e6b8b155b71df20fdc1d3
+SHA1 (patch-af) = 5f7006b5b1c7cbf23476ea7f9f437173530d4ef4
+SHA1 (patch-ag) = 188bf337797ef0643236c66927d4956436ac1925
diff --git a/graphics/xpaint/patches/patch-ad b/graphics/xpaint/patches/patch-ad
index 68d865369ec..20b7ae5e065 100644
--- a/graphics/xpaint/patches/patch-ad
+++ b/graphics/xpaint/patches/patch-ad
@@ -1,33 +1,37 @@
-$NetBSD: patch-ad,v 1.5 1999/05/09 18:47:22 tron Exp $
+$NetBSD: patch-ad,v 1.6 2002/12/16 09:29:13 tron Exp $
 
---- readRC.c	1998/02/04 16:36:16	1.1
-+++ readRC.c	1998/02/04 16:41:52
-@@ -64,6 +64,9 @@
+--- readRC.c.orig	Sun Nov 24 15:53:30 2002
++++ readRC.c	Sun Dec 15 18:58:00 2002
+@@ -75,6 +75,10 @@
  static FILE *
  openTemp(char **np)
  {
 +#ifdef __NetBSD__
 +    int	fd;
++    FILE *f;
 +#endif
      char *n;
      char xx[256];
  
-@@ -72,11 +75,20 @@
+@@ -83,11 +87,23 @@
  
      strcpy(xx, n);
-     strcat(xx, "/XPaintXXXXXXX");
+     strcat(xx, "/XPaint-XXXXXX");
 +#ifdef __NetBSD__
 +    if ((fd = mkstemp(xx)) < 0)
-+	    return (FILE *) NULL;
++           return NULL;
 +    tempName[++tempIndex] = XtNewString(xx);
 +    if (np != NULL)
-+	*np = tempName[tempIndex];
-+    return fdopen(fd, "w");
++       *np = tempName[tempIndex];
++    f = fdopen(fd, "w");
++    if (f == NULL)
++       (void) close(fd);
++    return f;
 +#else
      n = mktemp(xx);
      tempName[++tempIndex] = XtNewString(n);
      if (np != NULL)
- 	*np = tempName[tempIndex];
+         *np = tempName[tempIndex];
      return fopen(tempName[tempIndex], "w");
 +#endif
  }
diff --git a/graphics/xpaint/patches/patch-ae b/graphics/xpaint/patches/patch-ae
index ec3491964c0..84837e3a88f 100644
--- a/graphics/xpaint/patches/patch-ae
+++ b/graphics/xpaint/patches/patch-ae
@@ -1,9 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2001/03/30 21:44:49 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2002/12/16 09:29:13 tron Exp $
 
---- operation.c.orig	Sun Sep  3 00:07:08 2000
-+++ operation.c
-@@ -940,12 +940,14 @@
- 	    fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
+--- operation.c.orig	Sat Nov 23 12:02:08 2002
++++ operation.c	Sun Dec 15 23:09:43 2002
+@@ -928,11 +928,13 @@
+     MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1,
+ 	      fontSet, "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*"),
+     MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1,
+-	    fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
++	      fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
      MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1,
  	      fontSet, "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*"),
 -    MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1,
@@ -11,12 +15,7 @@ $NetBSD: patch-ae,v 1.2 2001/03/30 21:44:49 hubertf Exp $
 +    MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1,
 +	      fontSet, "-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1"),
 +    MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1,
-+	      fontSet, "-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1"),
++	      fontSet, "-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1");
      MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1,
  	      fontSet, "-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*"),
      MI_SEPARATOR(),
--#define FM_SELECT	11
-+#define FM_SELECT	12
-     MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
- };
- 
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index b8cba411a9c..d274c2d793d 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,19 +1,27 @@
-$NetBSD: patch-af,v 1.5 2002/10/26 19:43:46 bouyer Exp $
+$NetBSD: patch-af,v 1.6 2002/12/16 09:29:13 tron Exp $
 
---- Local.config.orig	Tue Jun 12 21:26:45 2001
-+++ Local.config	Tue Oct 22 13:03:07 2002
-@@ -43,7 +43,10 @@
+--- Local.config.orig	Sun Nov 17 22:18:23 2002
++++ Local.config	Mon Dec 16 10:06:50 2002
+@@ -7,7 +7,7 @@
+ XCOMM $Id: patch-af,v 1.6 2002/12/16 09:29:13 tron Exp $
+ 
+ XCOMM Local customization
+-SHAREDIR = /usr/share/xpaint
++SHAREDIR = $${X11PREFIX}/share/xpaint
+ PRINT_COMMAND = lpr -Plocal
+ POSTSCRIPT_VIEWER = gv
+ EXTERN_VIEWER = xv
+@@ -54,6 +54,9 @@
  
  #ifdef NetBSDArchitecture
  ARCH_DEFINES = -DHAVE_PARAM_H  
 +#ifdef arm32Architecture
 +CDEBUGFLAGS =
- #endif
 +#endif
+ #endif
  
  #ifdef OS2Architecture
- ARCH_DEFINES = -DMISSING_STRCASECMP
-@@ -105,11 +108,11 @@
+@@ -116,11 +119,11 @@
  XCOMM  You must have the XPM library.
  XCOMM  Make sure the path name to the library is correct.
  
@@ -27,7 +35,7 @@ $NetBSD: patch-af,v 1.5 2002/10/26 19:43:46 bouyer Exp $
  
  
  DEPENDFLAGS = -I./bitmaps
-@@ -135,14 +138,14 @@
+@@ -146,14 +149,14 @@
  
  XCOMM This should take care of everything needed for BSD.
  
diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag
new file mode 100644
index 00000000000..af9fe3ad23f
--- /dev/null
+++ b/graphics/xpaint/patches/patch-ag
@@ -0,0 +1,34 @@
+$NetBSD: patch-ag,v 1.1 2002/12/16 09:29:14 tron Exp $
+
+--- Imakefile.orig	Sun Nov 17 22:16:53 2002
++++ Imakefile	Mon Dec 16 10:20:41 2002
+@@ -114,10 +114,10 @@
+ xaw::
+ 	-$(RM) $(XAW95DEPENDS)
+ 	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
+-	xmkmf ; make
++	${XMKMF} ; make
+ 
+ libXaw95.so:
+-	cd xaw95-1.1.4 ; xmkmf -a ; make
++	cd xaw95-1.1.4 ; ${XMKMF} -a ; make
+ 	-$(RM) libXaw95.so libXaw95.a
+ 	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
+ 	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
+@@ -128,13 +128,13 @@
+ 	-$(RM) $(XAW95DEPENDS)
+ 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
+ 	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
+-	xmkmf ; make
++	${XMKMF} ; make
+ 
+ xaw95static:: libXaw95.a
+ 	-$(RM) $(XAW95DEPENDS)
+ 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
+-	echo "SYS_LIBRARIES = ./libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
+-	xmkmf ; make
++	echo "SYS_LIBRARIES = ./xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
++	${XMKMF} ; make
+ 
+ clean::
+ 	-$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*