From tkato@prontomail.com  Mon Nov 18 13:20:26 2002
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6197D37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Nov 2002 13:20:26 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2057C43EAF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Nov 2002 13:20:19 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from socigeog.hmt.toyama-u.ac.jp (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (8.12.6/8.12.3) with SMTP id gAILKH6A000721
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 06:20:17 +0900 (JST)
	(envelope-from tkato@prontomail.com)
Message-Id: <20021119061620.582215bd.tkato@prontomail.com>
Date: Tue, 19 Nov 2002 06:16:20 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: graphics/xpaint to 2.6.6

>Number:         45440
>Category:       ports
>Synopsis:       Update port: graphics/xpaint to 2.6.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 18 13:30:09 PST 2002
>Closed-Date:    Wed Nov 20 04:57:10 PST 2002
>Last-Modified:  Wed Nov 20 04:57:10 PST 2002
>Originator:     KATO Tsuguru
>Release:        4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.6.6

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile
--- /usr/ports/graphics/xpaint/Makefile	Mon Nov 11 18:59:55 2002
+++ graphics/xpaint/Makefile	Mon Nov 11 20:36:18 2002
@@ -6,19 +6,24 @@
 #
 
 PORTNAME=	xpaint
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.6
 CATEGORIES=	graphics
-MASTER_SITES=	http://home.worldonline.dk/torsten/xpaint/ \
-		ftp://ftp.win.ne.jp/pub/graphics/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.ac-grenoble.fr/Office/
+MASTER_SITE_SUBDIR=	sf-${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_BZIP2=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xpaint.1
+
+post-patch:
+	@${ECHO_CMD} \
+		"SYS_LIBRARIES = XawClientLibs -lm" > ${WRKSRC}/Local.xawdefs
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/xpaint/distinfo graphics/xpaint/distinfo
--- /usr/ports/graphics/xpaint/distinfo	Sat Dec 22 20:54:01 2001
+++ graphics/xpaint/distinfo	Fri Nov  8 22:40:50 2002
@@ -1 +1 @@
-MD5 (xpaint-2.6.2.tar.gz) = 9f22460f15a189721573d88454ce3d41
+MD5 (xpaint-2.6.6.tar.bz2) = 595bcf2dac5525ff757049a63d5e871d
diff -urN /usr/ports/graphics/xpaint/files/patch-aa graphics/xpaint/files/patch-aa
--- /usr/ports/graphics/xpaint/files/patch-aa	Fri Mar  9 04:39:07 2001
+++ graphics/xpaint/files/patch-aa	Fri Nov  8 23:17:31 2002
@@ -1,6 +1,6 @@
---- Local.config.orig	Sun Sep  3 07:02:09 2000
-+++ Local.config	Fri Mar  9 03:26:06 2001
-@@ -141,10 +141,12 @@
+--- Local.config.orig	Mon Oct 28 17:00:32 2002
++++ Local.config	Fri Nov  8 23:14:33 2002
+@@ -151,10 +151,13 @@
  #endif
  
  #if defined(FreeBSDArchitecture)
@@ -18,4 +18,5 @@
 +PNG_INCLUDE  = -I${LOCALBASE}/include
 +PNG_LIB      = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lpng -lz
 +XPM_INCLUDE = -I$(INCDIR)/X11
++SHAREDIR = $(LIBDIR)/xpaint
  #endif
diff -urN /usr/ports/graphics/xpaint/files/patch-ae graphics/xpaint/files/patch-ae
--- /usr/ports/graphics/xpaint/files/patch-ae	Fri Aug 31 22:49:54 2001
+++ graphics/xpaint/files/patch-ae	Fri Nov  8 22:50:33 2002
@@ -1,6 +1,6 @@
---- readRC.c.orig	Sun Sep  3 07:07:09 2000
-+++ readRC.c	Fri Mar  9 03:31:53 2001
-@@ -30,11 +30,13 @@
+--- 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
  
@@ -14,7 +14,7 @@
  
  #define RC_FILENAME	".XPaintrc"
  
-@@ -64,19 +66,32 @@
+@@ -73,19 +75,32 @@
  static FILE *
  openTemp(char **np)
  {
@@ -25,7 +25,7 @@
      char xx[256];
  
      if ((n = getenv("TMPDIR")) == NULL)
- 	n = "/tmp";
+         n = "/tmp";
  
 +#ifdef HAVE_MKSTEMP
 +    snprintf(xx, 256, "%s/%s", n, "/XPaintXXXXXXX");
@@ -33,12 +33,12 @@
 +    n = xx;
 +#else
      strcpy(xx, n);
-     strcat(xx, "/XPaintXXXXXXX");
+     strcat(xx, "/XPaint-XXXXXX");
      n = mktemp(xx);
 +#endif
      tempName[++tempIndex] = XtNewString(n);
      if (np != NULL)
- 	*np = tempName[tempIndex];
+         *np = tempName[tempIndex];
 +#ifdef HAVE_MKSTEMP
 +    return fdopen(fd, "w");
 +#else
diff -urN /usr/ports/graphics/xpaint/pkg-descr graphics/xpaint/pkg-descr
--- /usr/ports/graphics/xpaint/pkg-descr	Wed May 15 08:05:32 2002
+++ graphics/xpaint/pkg-descr	Sat Nov  2 00:24:16 2002
@@ -2,4 +2,4 @@
 program options.  It allows for the editing of multiple images simultaneously
 and supports various formats, including PPM, XBM, TIFF, etc.
 
-WWW: http://home.worldonline.dk/torsten/xpaint/
+WWW: http://sf-xpaint.sourceforge.net/
diff -urN /usr/ports/graphics/xpaint/pkg-plist graphics/xpaint/pkg-plist
--- /usr/ports/graphics/xpaint/pkg-plist	Mon Oct  5 12:13:41 1998
+++ graphics/xpaint/pkg-plist	Fri Nov  8 23:20:16 2002
@@ -1,2 +1,9 @@
 bin/xpaint
 lib/X11/app-defaults/XPaint
+lib/X11/xpaint/help/Help
+lib/X11/xpaint/help/Help_fr
+lib/X11/xpaint/messages/Messages
+lib/X11/xpaint/messages/Messages_fr
+@dirrm lib/X11/xpaint/messages
+@dirrm lib/X11/xpaint/help
+@dirrm lib/X11/xpaint
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Wed Nov 20 04:57:02 PST 2002 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45440 
>Unformatted:
