From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 13 18:10:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12D221065678 for ; Tue, 13 Jul 2010 18:10:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E58D08FC1E for ; Tue, 13 Jul 2010 18:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6DIAAWT084416 for ; Tue, 13 Jul 2010 18:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6DIAA5x084411; Tue, 13 Jul 2010 18:10:10 GMT (envelope-from gnats) Resent-Date: Tue, 13 Jul 2010 18:10:10 GMT Resent-Message-Id: <201007131810.o6DIAA5x084411@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 832EB106567D for ; Tue, 13 Jul 2010 18:04:12 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id D72538FC1B for ; Tue, 13 Jul 2010 18:04:11 +0000 (UTC) Received: from localhost.localdomain (ZT037007.ppp.dion.ne.jp [59.128.37.7]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id E4F7350037 for ; Wed, 14 Jul 2010 03:04:02 +0900 (JST) Message-Id: <20100714030106.151ac8f4.tkato432@yahoo.com> Date: Wed, 14 Jul 2010 03:01:06 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/148560: Update port: graphics/xpaint to 2.9.1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2010 18:10:11 -0000 >Number: 148560 >Category: ports >Synopsis: Update port: graphics/xpaint to 2.9.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 13 18:10:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.9.1.4 New file: files/patch-fileBrowser.c files/patch-rw__readWritePNG.c files/patch-xaw3dgxft__Imakefile Remove file: files/patch-bitmaps::Imakefile files/patch-fileName.c files/patch-readWritePNG.c >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile --- /usr/ports/graphics/xpaint/Makefile 2010-03-28 17:39:35.000000000 +0900 +++ graphics/xpaint/Makefile 2010-07-08 23:26:24.000000000 +0900 @@ -6,12 +6,9 @@ # PORTNAME= xpaint -PORTVERSION= 2.7.8.1 -PORTREVISION= 4 +PORTVERSION= 2.9.1.4 CATEGORIES= graphics -MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION} \ - ftp://ftp.ac-grenoble.fr/Office/ - +MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= A simple paint program @@ -25,20 +22,13 @@ MAN1= xpaint.1 -.if defined(WITH_NEXTAW) -LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw -XAW_INCDIR= ${LOCALBASE}/include/X11/neXtaw -XAW_LIBS= -lneXtaw -.else -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -XAW_INCDIR= ${LOCALBASE}/include/X11/Xaw3d -XAW_LIBS= -lXaw3d -.endif +post-patch: + @${REINPLACE_CMD} -e \ + 's|@PREFIX@|${PREFIX}|g ; \ + s|@XPMDIR@|${LOCALBASE}|g ; \ + s|@LOCALBASE@|${LOCALBASE}|g' ${WRKSRC}/Local.config pre-configure: - @cd ${WRKSRC} && ${LN} -sf ${XAW_INCDIR} xaw_incdir \ - && ${ECHO_CMD} -n > Local.xawdefs \ - && ${ECHO_CMD} "XAWLIB_DEFINES=-DXAW3D" >> Local.xawdefs \ - && ${ECHO_CMD} "SYS_LIBRARIES=${XAW_LIBS}" >> Local.xawdefs + @cd ${WRKSRC} && ${SH} ./configure xaw3dxft.a .include diff -urN /usr/ports/graphics/xpaint/distinfo graphics/xpaint/distinfo --- /usr/ports/graphics/xpaint/distinfo 2005-11-26 19:25:38.000000000 +0900 +++ graphics/xpaint/distinfo 2010-07-08 23:29:01.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (xpaint-2.7.8.1.tar.bz2) = e608680bd362531231af521f0df377ae -SHA256 (xpaint-2.7.8.1.tar.bz2) = a05d5dee119cba6424643f6184e376c2367011c55307c32fa96394697330aa7f -SIZE (xpaint-2.7.8.1.tar.bz2) = 459429 +MD5 (xpaint-2.9.1.4.tar.bz2) = 49f4effceb3f45b5af9423f1a702d91e +SHA256 (xpaint-2.9.1.4.tar.bz2) = a733736bd635bbf5b5a04b8061da132b317793ef9292ce6f07a85f9dcfdc114a +SIZE (xpaint-2.9.1.4.tar.bz2) = 1025885 diff -urN /usr/ports/graphics/xpaint/files/patch-Imakefile graphics/xpaint/files/patch-Imakefile --- /usr/ports/graphics/xpaint/files/patch-Imakefile 2005-08-30 11:14:47.000000000 +0900 +++ graphics/xpaint/files/patch-Imakefile 2010-05-29 14:07:12.000000000 +0900 @@ -1,15 +1,15 @@ ---- Imakefile.orig Fri Jun 3 21:26:03 2005 -+++ Imakefile Thu Aug 18 19:25:01 2005 -@@ -102,7 +102,7 @@ - #endif +--- Imakefile.orig 2010-04-07 14:37:45.000000000 +0900 ++++ Imakefile 2010-05-29 14:06:49.000000000 +0900 +@@ -94,7 +94,7 @@ DEPLIBS = always xpaint.man XPaint.ad --LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic -+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) - SUBDIRS = rw - -@@ -199,7 +199,7 @@ +-#if ! defined(__NetBSD__) && !defined(__FreeBSD__) ++#if ! defined(NetBSDArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = -Lrw -lrw -ldl -rdynamic \ + $(XPM_LIB) $(XFT_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) + #else +@@ -237,7 +237,7 @@ XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \ XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \ XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)" diff -urN /usr/ports/graphics/xpaint/files/patch-Local.config graphics/xpaint/files/patch-Local.config --- /usr/ports/graphics/xpaint/files/patch-Local.config 2005-09-16 20:04:49.000000000 +0900 +++ graphics/xpaint/files/patch-Local.config 2010-06-24 05:21:09.000000000 +0900 @@ -1,20 +1,48 @@ ---- 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 --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 -+TIFF_INCLUDE = -I${LOCALBASE}/include -+TIFF_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ltiff -+JPEG_INCLUDE = -I${LOCALBASE}/include -+JPEG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ljpeg -+PNG_INCLUDE = -I${LOCALBASE}/include -+PNG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lpng -lz -+XPM_INCLUDE = -I$(INCDIR)/X11 -+SHAREDIR = $(LIBDIR)/xpaint +--- Local.config.orig 2010-02-23 23:11:07.000000000 +0900 ++++ Local.config 2010-06-24 05:20:52.000000000 +0900 +@@ -20,9 +20,8 @@ + LPCCMD = /usr/sbin/lpc status + #define LPCCMD + +-#if defined(__NetBSD__) || defined(__FreeBSD) ++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) + SHAREDIR = @PREFIX@/share/xpaint +-LPCCMD = @PREFIX@/sbin/lpc status #endif + + XCOMM Enable/disable PRINTCAP (for BSD style printing configuration) +@@ -138,13 +137,13 @@ + XCOMM + + XCOMM You must have the freetype2 library. +-XFT_INCLUDE = -I/usr/include/freetype2 +-XFT_LIB = -lXft ++XFT_INCLUDE = `pkg-config --cflags xft` ++XFT_LIB = `pkg-config --libs xft` + + XCOMM You must have the XPM library. + XCOMM Make sure the path name to the library is correct. + +-#if defined(__NetBSD__) || defined(__FreeBSD) ++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) + XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm -lX11 -lm -lXmu -lXext + #else + XPM_LIB = -L/usr/lib -Wl,-R/usr/lib -lXpm -lX11 -lm -lXmu -lXext +@@ -152,7 +151,7 @@ + + XCOMM Make sure this points to the location of the 'xpm.h' file. + +-#if defined(__NetBSD__) || defined(__FreeBSD) ++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) + XPM_INCLUDE = -I@XPMDIR@/include/X11 + #else + XPM_INCLUDE = -I/usr/include/X11 +@@ -182,7 +181,7 @@ + + XCOMM This should take care of everything needed for BSD. + +-#if defined(__NetBSD__) || defined(__FreeBSD__) ++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) + TIFF_INCLUDE = -I@LOCALBASE@/include + TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff + JPEG_INCLUDE = -I@LOCALBASE@/include diff -urN /usr/ports/graphics/xpaint/files/patch-bitmaps::Imakefile graphics/xpaint/files/patch-bitmaps::Imakefile --- /usr/ports/graphics/xpaint/files/patch-bitmaps::Imakefile 2005-08-30 11:14:47.000000000 +0900 +++ graphics/xpaint/files/patch-bitmaps::Imakefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,105 +0,0 @@ ---- bitmaps/Imakefile.orig Thu Nov 14 19:09:21 2002 -+++ bitmaps/Imakefile Thu Aug 18 19:33:12 2005 -@@ -1,5 +1,101 @@ - MISC = Imakefile --SRCS = *\/* -+SRCS = \ -+ big_tools/arcOp.xpm \ -+ big_tools/arrowOp.xpm \ -+ big_tools/boxOp.xpm \ -+ big_tools/brokenlineOp.xpm \ -+ big_tools/brushOp.xpm \ -+ big_tools/dotPenOp.xpm \ -+ big_tools/dynPenOp.xpm \ -+ big_tools/eraseOp.xpm \ -+ big_tools/fillOp.xpm \ -+ big_tools/filledBoxOp.xpm \ -+ big_tools/filledFreehandOp.xpm \ -+ big_tools/filledOvalOp.xpm \ -+ big_tools/filledPolygonOp.xpm \ -+ big_tools/filledSplineOp.xpm \ -+ big_tools/fractalFillOp.xpm \ -+ big_tools/freehandOp.xpm \ -+ big_tools/gradientFillOp.xpm \ -+ big_tools/lineOp.xpm \ -+ big_tools/ovalOp.xpm \ -+ big_tools/pencilOp.xpm \ -+ big_tools/polygonOp.xpm \ -+ big_tools/rayOp.xpm \ -+ big_tools/selectBoxOp.xpm \ -+ big_tools/selectFreehandOp.xpm \ -+ big_tools/selectOvalOp.xpm \ -+ big_tools/selectPolygonOp.xpm \ -+ big_tools/selectSplineOp.xpm \ -+ big_tools/smearOp.xpm \ -+ big_tools/splineOp.xpm \ -+ big_tools/sprayOp.xpm \ -+ big_tools/textOp.xpm \ -+ brushes/paintA.xpm \ -+ brushes/paintB.xpm \ -+ brushes/paintC.xpm \ -+ brushes/paintD.xpm \ -+ brushes/paintE.xpm \ -+ brushes/paintF.xpm \ -+ brushes/paintG.xpm \ -+ brushes/paintH.xpm \ -+ brushes/paintI.xpm \ -+ brushes/paintJ.xpm \ -+ brushes/paintK.xpm \ -+ brushes/paintL.xpm \ -+ brushes/paintM.xpm \ -+ brushes/paintN.xpm \ -+ brushes/paintO.xpm \ -+ brushes/paintP.xpm \ -+ brushes/paintQ.xpm \ -+ brushes/paintR.xpm \ -+ brushes/paintS.xpm \ -+ brushes/paintT.xpm \ -+ small_tools/arcOp.xpm \ -+ small_tools/arrowOp.xpm \ -+ small_tools/boxOp.xpm \ -+ small_tools/brokenlineOp.xpm \ -+ small_tools/brushOp.xpm \ -+ small_tools/dotPenOp.xpm \ -+ small_tools/dynPenOp.xpm \ -+ small_tools/eraseOp.xpm \ -+ small_tools/fillOp.xpm \ -+ small_tools/filledBoxOp.xpm \ -+ small_tools/filledFreehandOp.xpm \ -+ small_tools/filledOvalOp.xpm \ -+ small_tools/filledPolygonOp.xpm \ -+ small_tools/filledSplineOp.xpm \ -+ small_tools/fractalFillOp.xpm \ -+ small_tools/freehandOp.xpm \ -+ small_tools/gradientFillOp.xpm \ -+ small_tools/lineOp.xpm \ -+ small_tools/ovalOp.xpm \ -+ small_tools/pencilOp.xpm \ -+ small_tools/polygonOp.xpm \ -+ small_tools/rayOp.xpm \ -+ small_tools/selectBoxOp.xpm \ -+ small_tools/selectFreehandOp.xpm \ -+ small_tools/selectOp.xpm \ -+ small_tools/selectOvalOp.xpm \ -+ small_tools/selectPolygonOp.xpm \ -+ small_tools/selectSplineOp.xpm \ -+ small_tools/smearOp.xpm \ -+ small_tools/splineOp.xpm \ -+ small_tools/sprayOp.xpm \ -+ small_tools/textOp.xpm \ -+ xbm/arrows.xbm \ -+ xbm/background.xbm \ -+ xbm/checkmark.xbm \ -+ xbm/defspray.xbm \ -+ xbm/pullright.xbm \ -+ xbm/wait1.xbm \ -+ xbm/wait2.xbm \ -+ xbm/wait3.xbm \ -+ xbm/wait4.xbm \ -+ xpm/eye.xpm \ -+ xpm/fill0.xpm \ -+ xpm/fill1.xpm \ -+ xpm/fill2.xpm - - makelist: - sh -c 'for i in '"$(TEXT) $(SRCS) $(MISC) $(HDRS)"' ; do \ diff -urN /usr/ports/graphics/xpaint/files/patch-fileBrowser.c graphics/xpaint/files/patch-fileBrowser.c --- /usr/ports/graphics/xpaint/files/patch-fileBrowser.c 1970-01-01 09:00:00.000000000 +0900 +++ graphics/xpaint/files/patch-fileBrowser.c 2010-05-29 13:24:15.000000000 +0900 @@ -0,0 +1,20 @@ +--- fileBrowser.c.orig 2010-04-28 17:02:11.000000000 +0900 ++++ fileBrowser.c 2010-05-29 13:23:51.000000000 +0900 +@@ -40,7 +40,7 @@ + #include + #include + #include +-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) ++#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) || defined(__FreeBSD__) + #include + #else + #include +@@ -513,7 +513,7 @@ + setCWD(arg_t * arg, char *dir) + { + DIR *dirp; +-#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 -urN /usr/ports/graphics/xpaint/files/patch-fileName.c graphics/xpaint/files/patch-fileName.c --- /usr/ports/graphics/xpaint/files/patch-fileName.c 2005-09-16 20:04:49.000000000 +0900 +++ graphics/xpaint/files/patch-fileName.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- fileName.c.orig Mon Nov 8 21:41:46 2004 -+++ fileName.c Sun Jan 30 18:55:53 2005 -@@ -38,7 +38,7 @@ - #include - #include - #include --#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) -+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) || defined(__FreeBSD__) - #include - #else - #include -@@ -409,7 +409,7 @@ - setCWD(arg_t * arg, char *dir) - { - DIR *dirp; --#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 -urN /usr/ports/graphics/xpaint/files/patch-readWritePNG.c graphics/xpaint/files/patch-readWritePNG.c --- /usr/ports/graphics/xpaint/files/patch-readWritePNG.c 2010-03-31 20:45:49.000000000 +0900 +++ graphics/xpaint/files/patch-readWritePNG.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- rw/readWritePNG.c.orig 2005-03-20 21:15:34.000000000 +0100 -+++ rw/readWritePNG.c 2010-03-29 16:48:36.000000000 +0200 -@@ -51,7 +51,7 @@ - fread(header, 1, 8, fp); - fclose(fp); - -- return png_check_sig( (unsigned char*) header, 8); -+ return !png_sig_cmp( (unsigned char*) header, 0, 8); - } - - diff -urN /usr/ports/graphics/xpaint/files/patch-rw__readWritePNG.c graphics/xpaint/files/patch-rw__readWritePNG.c --- /usr/ports/graphics/xpaint/files/patch-rw__readWritePNG.c 1970-01-01 09:00:00.000000000 +0900 +++ graphics/xpaint/files/patch-rw__readWritePNG.c 2010-06-24 04:56:59.000000000 +0900 @@ -0,0 +1,22 @@ +--- rw/readWritePNG.c.orig 2010-05-14 06:24:49.000000000 +0900 ++++ rw/readWritePNG.c 2010-06-24 04:56:04.000000000 +0900 +@@ -10,15 +10,14 @@ + #include + #include + +-typedef char *String; +-#include +-#include +-#include "rwTable.h" +- + #include + #include + #include "xpaint.h" + ++#include ++#include ++#include "rwTable.h" ++ + #ifndef TRUE + # define TRUE 1 + # define FALSE 0 diff -urN /usr/ports/graphics/xpaint/files/patch-rw_libpnmrw.c graphics/xpaint/files/patch-rw_libpnmrw.c --- /usr/ports/graphics/xpaint/files/patch-rw_libpnmrw.c 2005-09-16 20:04:49.000000000 +0900 +++ graphics/xpaint/files/patch-rw_libpnmrw.c 2010-05-29 13:27:50.000000000 +0900 @@ -1,18 +1,11 @@ ---- rw/libpnmrw.c.orig Sun Apr 10 17:52:02 2005 -+++ rw/libpnmrw.c Sun Apr 17 01:33:51 2005 -@@ -131,6 +131,7 @@ +--- rw/libpnmrw.c.orig 2009-12-09 05:39:15.000000000 +0900 ++++ rw/libpnmrw.c 2010-05-29 13:26:56.000000000 +0900 +@@ -131,7 +131,7 @@ static void pm_perror(char *reason) { +-#if !defined(__NetBSD__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) #if defined(BSD4_4) __const extern char *__const sys_errlist[]; #else -@@ -141,6 +142,7 @@ - #else - #ifdef MISSING_STRERROR - extern char *sys_errlist[]; -+#endif - #endif - #endif - #endif diff -urN /usr/ports/graphics/xpaint/files/patch-rw_rwTable.c graphics/xpaint/files/patch-rw_rwTable.c --- /usr/ports/graphics/xpaint/files/patch-rw_rwTable.c 2005-09-16 20:04:49.000000000 +0900 +++ graphics/xpaint/files/patch-rw_rwTable.c 2010-05-29 13:29:24.000000000 +0900 @@ -1,18 +1,11 @@ ---- rw/rwTable.c.orig Sun Apr 10 17:52:02 2005 -+++ rw/rwTable.c Sun Apr 17 01:35:47 2005 -@@ -249,6 +249,7 @@ +--- rw/rwTable.c.orig 2010-04-09 14:27:03.000000000 +0900 ++++ rw/rwTable.c 2010-05-29 13:28:58.000000000 +0900 +@@ -296,7 +296,7 @@ char * RWGetMsg() { +-#ifndef __NetBSD__ +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) #if defined(BSD4_4) __const extern char *__const sys_errlist[]; #else -@@ -258,6 +259,7 @@ - # define sys_errlist _sys_errlist - #else - extern char *sys_errlist[]; -+#endif - #endif - #endif - #endif diff -urN /usr/ports/graphics/xpaint/files/patch-xaw3dgxft__Imakefile graphics/xpaint/files/patch-xaw3dgxft__Imakefile --- /usr/ports/graphics/xpaint/files/patch-xaw3dgxft__Imakefile 1970-01-01 09:00:00.000000000 +0900 +++ graphics/xpaint/files/patch-xaw3dgxft__Imakefile 2010-05-29 13:58:21.000000000 +0900 @@ -0,0 +1,15 @@ +--- xaw3dxft/Imakefile.orig 2010-03-13 04:07:59.000000000 +0900 ++++ xaw3dxft/Imakefile 2010-05-29 13:57:44.000000000 +0900 +@@ -25,10 +25,10 @@ + #define IncSubSubdir Xaw3dxft + + XCOMM When building outside an X11 source tree: +-EXTRA_INCLUDES = -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 ++EXTRA_INCLUDES = -I. `pkg-config --cflags xft` + + #ifdef SharedXawReqs +-REQUIREDLIBS = SharedXawReqs -lXft ++REQUIREDLIBS = SharedXawReqs `pkg-config --libs xft` + #endif + + diff -urN /usr/ports/graphics/xpaint/pkg-plist graphics/xpaint/pkg-plist --- /usr/ports/graphics/xpaint/pkg-plist 2004-08-28 21:58:52.000000000 +0900 +++ graphics/xpaint/pkg-plist 2010-06-24 05:43:57.000000000 +0900 @@ -1,66 +1,130 @@ @comment $FreeBSD: ports/graphics/xpaint/pkg-plist,v 1.8 2004/08/28 06:32:20 krion Exp $ +bin/imgmerge +bin/pdfconcat bin/xpaint lib/X11/app-defaults/XPaint lib/X11/app-defaults/XPaint_es lib/X11/app-defaults/XPaint_fr -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_es -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_es -lib/X11/xpaint/messages/Messages_fr -@dirrm lib/X11/xpaint/messages -@dirrm lib/X11/xpaint/help -@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 +%%DATADIR%%/XPaintIcon.xpm +%%DATADIR%%/bin/xpaint_ocr +%%DATADIR%%/bitmaps/brushbox.cfg +%%DATADIR%%/bitmaps/brushes/paint0.xpm +%%DATADIR%%/bitmaps/brushes/paint1.xpm +%%DATADIR%%/bitmaps/brushes/paint2.xpm +%%DATADIR%%/bitmaps/brushes/paint3.xpm +%%DATADIR%%/bitmaps/brushes/paint4.xpm +%%DATADIR%%/bitmaps/brushes/paint5.xpm +%%DATADIR%%/bitmaps/brushes/paint6.xpm +%%DATADIR%%/bitmaps/brushes/paintA.xpm +%%DATADIR%%/bitmaps/brushes/paintB.xpm +%%DATADIR%%/bitmaps/brushes/paintC.xpm +%%DATADIR%%/bitmaps/brushes/paintD.xpm +%%DATADIR%%/bitmaps/brushes/paintE.xpm +%%DATADIR%%/bitmaps/brushes/paintF.xpm +%%DATADIR%%/bitmaps/brushes/paintG.xpm +%%DATADIR%%/bitmaps/brushes/paintH.xpm +%%DATADIR%%/bitmaps/brushes/paintI.xpm +%%DATADIR%%/bitmaps/brushes/paintJ.xpm +%%DATADIR%%/bitmaps/brushes/paintK.xpm +%%DATADIR%%/bitmaps/brushes/paintL.xpm +%%DATADIR%%/bitmaps/brushes/paintM.xpm +%%DATADIR%%/bitmaps/brushes/paintN.xpm +%%DATADIR%%/bitmaps/brushes/paintO.xpm +%%DATADIR%%/bitmaps/brushes/paintP.xpm +%%DATADIR%%/bitmaps/brushes/paintQ.xpm +%%DATADIR%%/bitmaps/brushes/paintR.xpm +%%DATADIR%%/bitmaps/brushes/paintS.xpm +%%DATADIR%%/bitmaps/brushes/paintT.xpm +%%DATADIR%%/bitmaps/brushes/paintU.xpm +%%DATADIR%%/bitmaps/brushes/paintV.xpm +%%DATADIR%%/bitmaps/brushes/paintW.xpm +%%DATADIR%%/bitmaps/brushes/paintX.xpm +%%DATADIR%%/bitmaps/brushes/paintY.xpm +%%DATADIR%%/bitmaps/brushes/paintZ.xpm +%%DATADIR%%/bitmaps/elec/busH.xpm +%%DATADIR%%/bitmaps/elec/busV.xpm +%%DATADIR%%/bitmaps/elec/capH.xpm +%%DATADIR%%/bitmaps/elec/capV.xpm +%%DATADIR%%/bitmaps/elec/coilV.xpm +%%DATADIR%%/bitmaps/elec/dioV.xpm +%%DATADIR%%/bitmaps/elec/fetV.xpm +%%DATADIR%%/bitmaps/elec/grid.xpm +%%DATADIR%%/bitmaps/elec/op_amp.xpm +%%DATADIR%%/bitmaps/elec/resH.xpm +%%DATADIR%%/bitmaps/elec/resV.xpm +%%DATADIR%%/bitmaps/elec/tfxV.xpm +%%DATADIR%%/bitmaps/elec/traV.xpm +%%DATADIR%%/c_scripts/3d_curves/helicoid.c +%%DATADIR%%/c_scripts/3d_curves/lissajous.c +%%DATADIR%%/c_scripts/3d_surfaces/ellipsoid.c +%%DATADIR%%/c_scripts/3d_surfaces/genre_g.c +%%DATADIR%%/c_scripts/3d_surfaces/heart.c +%%DATADIR%%/c_scripts/3d_surfaces/hyperboloid.c +%%DATADIR%%/c_scripts/3d_surfaces/polyhedra.c +%%DATADIR%%/c_scripts/3d_surfaces/torus.c +%%DATADIR%%/c_scripts/3d_surfaces/trefoil.c +%%DATADIR%%/c_scripts/3d_surfaces/waves.c +%%DATADIR%%/c_scripts/batch/batch.c +%%DATADIR%%/c_scripts/filters/clean.c +%%DATADIR%%/c_scripts/filters/leftright.c +%%DATADIR%%/c_scripts/filters/mapping.c +%%DATADIR%%/c_scripts/filters/merge.c +%%DATADIR%%/c_scripts/filters/permute.c +%%DATADIR%%/c_scripts/filters/rotleft.c +%%DATADIR%%/c_scripts/filters/rotright.c +%%DATADIR%%/c_scripts/filters/updown.c +%%DATADIR%%/c_scripts/images/alpha_test.c +%%DATADIR%%/c_scripts/images/rgb_test.c +%%DATADIR%%/c_scripts/layers/combine.c +%%DATADIR%%/c_scripts/procedures/proc_with_params.c +%%DATADIR%%/c_scripts/procedures/setmemory.c +%%DATADIR%%/c_scripts/templates/image.c +%%DATADIR%%/help/Help +%%DATADIR%%/help/Help_es +%%DATADIR%%/help/Help_fr +%%DATADIR%%/include/Colormap.h +%%DATADIR%%/include/ColormapP.h +%%DATADIR%%/include/DefaultRC.txt.h +%%DATADIR%%/include/Paint.h +%%DATADIR%%/include/PaintP.h +%%DATADIR%%/include/XPaint.ad.h +%%DATADIR%%/include/Xpaint.h +%%DATADIR%%/include/Xpaint3d.h +%%DATADIR%%/include/color.h +%%DATADIR%%/include/crc32.h +%%DATADIR%%/include/graphic.h +%%DATADIR%%/include/hash.h +%%DATADIR%%/include/image.h +%%DATADIR%%/include/menu.h +%%DATADIR%%/include/messages.h +%%DATADIR%%/include/misc.h +%%DATADIR%%/include/operation.h +%%DATADIR%%/include/ops.h +%%DATADIR%%/include/palette.h +%%DATADIR%%/include/patchlevel.h +%%DATADIR%%/include/print.h +%%DATADIR%%/include/protocol.h +%%DATADIR%%/include/rc.h +%%DATADIR%%/include/region.h +%%DATADIR%%/include/text.h +%%DATADIR%%/include/xpaint.h +%%DATADIR%%/messages/Messages +%%DATADIR%%/messages/Messages_es +%%DATADIR%%/messages/Messages_fr +@dirrm %%DATADIR%%/messages +@dirrm %%DATADIR%%/include +@dirrm %%DATADIR%%/help +@dirrm %%DATADIR%%/c_scripts/templates +@dirrm %%DATADIR%%/c_scripts/procedures +@dirrm %%DATADIR%%/c_scripts/layers +@dirrm %%DATADIR%%/c_scripts/images +@dirrm %%DATADIR%%/c_scripts/filters +@dirrm %%DATADIR%%/c_scripts/batch +@dirrm %%DATADIR%%/c_scripts/3d_surfaces +@dirrm %%DATADIR%%/c_scripts/3d_curves +@dirrm %%DATADIR%%/c_scripts +@dirrm %%DATADIR%%/bitmaps/elec +@dirrm %%DATADIR%%/bitmaps/brushes +@dirrm %%DATADIR%%/bitmaps +@dirrm %%DATADIR%%/bin +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: