From 432a448e729f1efb5579e75c02bb60db54eb447d Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Mon, 31 Oct 2005 23:24:19 +0000
Subject: [PATCH] maintenance update to 2.7.8.1

---
 graphics/xpaint/Makefile                   |  5 ++--
 graphics/xpaint/distinfo                   |  8 +++---
 graphics/xpaint/patches/patch-Imakefile    | 33 +++++++++-------------
 graphics/xpaint/patches/patch-fileName_c   |  8 +++---
 graphics/xpaint/patches/patch-rw_rwTable_c | 10 +++----
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 3f2d8026173..5392487ba24 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.36 2005/09/05 13:53:45 espie Exp $
+# $OpenBSD: Makefile,v 1.37 2005/10/31 23:24:19 naddy Exp $
 
 COMMENT=		"simple paint program"
 
-DISTNAME=		xpaint-2.7.7
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		xpaint-2.7.8.1
 CATEGORIES=		graphics x11
 
 HOMEPAGE=		http://sf-xpaint.sourceforge.net/
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 22a76accb32..abae14e5cde 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-MD5 (xpaint-2.7.7.tar.bz2) = e6086b87adf5bac8e6d207248b760eff
-RMD160 (xpaint-2.7.7.tar.bz2) = 0edecaaebc04c6adfc11d5883cfafe9ebd7066f6
-SHA1 (xpaint-2.7.7.tar.bz2) = c7e170af9a75098d2763346268726d33e0a5713b
-SIZE (xpaint-2.7.7.tar.bz2) = 403208
+MD5 (xpaint-2.7.8.1.tar.bz2) = e608680bd362531231af521f0df377ae
+RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf
+SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa
+SIZE (xpaint-2.7.8.1.tar.bz2) = 459429
diff --git a/graphics/xpaint/patches/patch-Imakefile b/graphics/xpaint/patches/patch-Imakefile
index 1a2add60ed6..0b1ed196be5 100644
--- a/graphics/xpaint/patches/patch-Imakefile
+++ b/graphics/xpaint/patches/patch-Imakefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Imakefile,v 1.1 2005/05/24 19:49:28 naddy Exp $
---- Imakefile.orig	Wed Apr 27 14:59:37 2005
-+++ Imakefile	Tue May 24 11:39:09 2005
+$OpenBSD: patch-Imakefile,v 1.2 2005/10/31 23:24:19 naddy Exp $
+--- Imakefile.orig	Fri Jun  3 14:26:03 2005
++++ Imakefile	Tue Nov  1 00:16:20 2005
 @@ -102,7 +102,7 @@ SGI_LIB = -limage
  #endif
  
@@ -10,21 +10,16 @@ $OpenBSD: patch-Imakefile,v 1.1 2005/05/24 19:49:28 naddy Exp $
  
  SUBDIRS = rw
  
-@@ -152,7 +152,7 @@ install::
+@@ -136,8 +136,10 @@ install::
+ 	chmod -R a+r $(DESTDIR)$(SHAREDIR)/
  
  xaw::
- 	-$(RM) $(XAWDEPENDS)
--	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
-+	-$(RM) xaw_incdir ; ln -sf ${X11BASE}/include/X11/Xaw xaw_incdir
- 	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
- 	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
- 	xmkmf -a ; make
-@@ -164,7 +164,7 @@ xaw::
- 
- xaw3d::
- 	-$(RM) $(XAWDEPENDS)
--	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw3d xaw_incdir	
-+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw3d xaw_incdir	
- 	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
- 	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
- 	xmkmf ; cd rw ; xmkmf ; cd .. ; make
+-	-$(RM) $(XAWDEPENDS)
+-	./configure xaw ; make		
++	-$(RM) $(XAWDEPENDS) ; ln -sf ${X11BASE}/include/X11/Xaw xaw_incdir
++	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs
++	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
++	xmkmf ; (cd rw ; xmkmf) ; make
+ 	@echo ""
+ 	@echo "'xpaint' compiled with Xaw widgets (old and ugly)"
+ 	@echo "You should rather use Xaw3d, neXtaw or Xaw95 !!"	
diff --git a/graphics/xpaint/patches/patch-fileName_c b/graphics/xpaint/patches/patch-fileName_c
index bed9ea420ac..36c911c7d46 100644
--- a/graphics/xpaint/patches/patch-fileName_c
+++ b/graphics/xpaint/patches/patch-fileName_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-fileName_c,v 1.1 2005/05/24 19:49:28 naddy Exp $
---- fileName.c.orig	Mon May 23 23:12:09 2005
-+++ fileName.c	Mon May 23 23:13:09 2005
+$OpenBSD: patch-fileName_c,v 1.2 2005/10/31 23:24:19 naddy Exp $
+--- fileName.c.orig	Wed Aug 17 14:31:56 2005
++++ fileName.c	Tue Nov  1 00:03:27 2005
 @@ -39,7 +39,7 @@
  #include <stdio.h>
  #include <sys/types.h>
@@ -10,7 +10,7 @@ $OpenBSD: patch-fileName_c,v 1.1 2005/05/24 19:49:28 naddy Exp $
  #include <dirent.h>
  #else
  #include <sys/dir.h>
-@@ -455,7 +455,7 @@ static void 
+@@ -461,7 +461,7 @@ static void 
  setCWD(arg_t * arg, char *dir)
  {
      DIR *dirp;
diff --git a/graphics/xpaint/patches/patch-rw_rwTable_c b/graphics/xpaint/patches/patch-rw_rwTable_c
index 6bea10c003e..ba9d088d746 100644
--- a/graphics/xpaint/patches/patch-rw_rwTable_c
+++ b/graphics/xpaint/patches/patch-rw_rwTable_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-rw_rwTable_c,v 1.4 2005/05/24 19:49:28 naddy Exp $
---- rw/rwTable.c.orig	Mon May 23 23:02:00 2005
-+++ rw/rwTable.c	Mon May 23 23:03:31 2005
-@@ -249,6 +249,7 @@ RWtableGetWriterList()
+$OpenBSD: patch-rw_rwTable_c,v 1.5 2005/10/31 23:24:19 naddy Exp $
+--- rw/rwTable.c.orig	Wed Aug 17 15:00:25 2005
++++ rw/rwTable.c	Tue Nov  1 00:03:27 2005
+@@ -251,6 +251,7 @@ RWtableGetWriterList()
  char *
  RWGetMsg()
  {
@@ -9,7 +9,7 @@ $OpenBSD: patch-rw_rwTable_c,v 1.4 2005/05/24 19:49:28 naddy Exp $
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -258,6 +259,7 @@ RWGetMsg()
+@@ -260,6 +261,7 @@ RWGetMsg()
  #  define sys_errlist _sys_errlist
  #else
      extern char *sys_errlist[];