6 files changed, 16 insertions, 47 deletions

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 89bd0d6ca60e..33dc5cd02d91 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpaint
-PORTVERSION=	2.5.7
+PORTVERSION=	2.6.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://home.worldonline.dk/~torsten/xpaint/ \
 		ftp://ftp.win.ne.jp/pub/graphics/
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.4:${PORTSDIR}/graphics/png
 
-WRKSRC=		${WRKDIR}/xpaint
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xpaint.1
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index d86eaf93694f..a13c52277674 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1 +1 @@
-MD5 (xpaint-2.5.7.tar.gz) = 878f6773a46ad2354772b17b1a9f3963
+MD5 (xpaint-2.6.1.tar.gz) = 0d3f8e265ae2e9cf121a10242444370e
diff --git a/graphics/xpaint/files/patch-ab b/graphics/xpaint/files/patch-ab
index 822f3f99ba9f..1b6277760b71 100644
--- a/graphics/xpaint/files/patch-ab
+++ b/graphics/xpaint/files/patch-ab
@@ -1,20 +1,20 @@
---- fileName.c.orig	Wed Feb 25 05:38:43 1998
-+++ fileName.c	Fri Mar 17 00:46:02 2000
+--- fileName.c.orig	Wed Oct  4 00:11:54 2000
++++ fileName.c	Wed Oct  4 00:13:04 2000
 @@ -37,7 +37,7 @@
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
--#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN32__)
-+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN32__) || defined(__FreeBSD__)
+-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__)
++#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__FreeBSD__)
  #include <dirent.h>
  #else
  #include <sys/dir.h>
-@@ -375,7 +375,7 @@
+@@ -395,7 +395,7 @@
  setCWD(arg_t * arg, char *dir)
  {
      DIR *dirp;
--#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN32__)
-+#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN32__) || defined(__FreeBSD__)
+-#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__)
++#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__) || defined(__FreeBSD__)
      struct dirent *e;
  #else
      struct direct *e;
diff --git a/graphics/xpaint/files/patch-ac b/graphics/xpaint/files/patch-ac
deleted file mode 100644
index 48504c3d86ed..000000000000
--- a/graphics/xpaint/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig	Wed Jun 10 06:14:27 1998
-+++ main.c	Fri Mar 17 01:18:33 2000
-@@ -275,7 +275,7 @@
- }
- 
- 
--void 
-+int
- main(int argc, char *argv[])
- {
-     Display *dpy;
diff --git a/graphics/xpaint/files/patch-ad b/graphics/xpaint/files/patch-ad
deleted file mode 100644
index 0cac3e2cb5c2..000000000000
--- a/graphics/xpaint/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc.h.orig	Wed Jun 10 06:07:47 1998
-+++ misc.h	Fri Mar 17 01:34:25 2000
-@@ -23,7 +23,7 @@
- long random(void);
- #endif
- 
--#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__)
-+#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__OpenBSD__)
- #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
- void srandom(unsigned int);
- #else
-@@ -102,7 +102,7 @@
- void GetDefaultWH(int *w, int *h);
- char *GetDefaultRC(void);
- void SetIconImage(Widget w);
--void main(int argc, char *argv[]);
-+int main(int argc, char *argv[]);
- 
- /* misc.c */
- Widget GetToplevel(Widget w);
diff --git a/graphics/xpaint/files/patch-af b/graphics/xpaint/files/patch-af
index b1619e36a48f..f28d681d3308 100644
--- a/graphics/xpaint/files/patch-af
+++ b/graphics/xpaint/files/patch-af
@@ -1,11 +1,11 @@
---- rw/libpnmrw.c.orig	Wed Jun 10 06:08:57 1998
-+++ rw/libpnmrw.c	Fri Mar 17 01:40:21 2000
+--- 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(__CYGWIN32__)
-+#if defined(__EMX__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#if defined(__EMX__) || defined(__CYGWIN__)
++#if defined(__EMX__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  #include <errno.h>
  #endif
  
@@ -17,9 +17,9 @@
  #if defined(BSD4_4)
      __const extern char *__const sys_errlist[];
  #else
-@@ -140,6 +141,7 @@
+@@ -146,6 +147,7 @@
  #endif
- #if !defined(__EMX__) || defined(__CYGWIN32__)
+ #if !defined(__EMX__) || defined(__CYGWIN__)
      extern int errno;
 +#endif
  #endif