Attachment #107737 for bug #148560

View | Details | Raw Unified | Return to bug 148560
Collapse All | Expand All




#

PORTNAME=	xpaint
PORTVERSION=	2.9.1.4
PORTREVISION=	4
CATEGORIES=	graphics
MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
		ftp://ftp.ac-grenoble.fr/Office/


MAINTAINER=	ports@FreeBSD.org
COMMENT=	A simple paint program


MAN1=		xpaint.1

post-patch:
	@${REINPLACE_CMD} -e \
		's|@PREFIX@|${PREFIX}|g ; \
		 s|@XPMDIR@|${LOCALBASE}|g ; \
		 s|@LOCALBASE@|${LOCALBASE}|g' ${WRKSRC}/Local.config
LIB_DEPENDS+=  Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
XAW_INCDIR=	${LOCALBASE}/include/X11/Xaw3d
XAW_LIBS=	-lXaw3d
.endif

pre-configure:
	@cd ${WRKSRC} && ${SH} ./configure xaw3dxft.a
		&& ${ECHO_CMD} -n > Local.xawdefs \
		&& ${ECHO_CMD} "XAWLIB_DEFINES=-DXAW3D" >> Local.xawdefs \
		&& ${ECHO_CMD} "SYS_LIBRARIES=${XAW_LIBS}" >> Local.xawdefs

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/xpaint/distinfo (-3 / +3 lines)
1	MD5 (xpaint-2.7.8.1.tar.bz2) = e608680bd362531231af521f0df377ae	1	MD5 (xpaint-2.9.1.4.tar.bz2) = 49f4effceb3f45b5af9423f1a702d91e
2	SHA256 (xpaint-2.7.8.1.tar.bz2) = a05d5dee119cba6424643f6184e376c2367011c55307c32fa96394697330aa7f	2	SHA256 (xpaint-2.9.1.4.tar.bz2) = a733736bd635bbf5b5a04b8061da132b317793ef9292ce6f07a85f9dcfdc114a
3	SIZE (xpaint-2.7.8.1.tar.bz2) = 459429	3	SIZE (xpaint-2.9.1.4.tar.bz2) = 1025885




--- Imakefile.orig	2010-04-07 14:37:45.000000000 +0900
+++ Imakefile	2010-05-29 14:06:49.000000000 +0900
@@ -94,7 +94,7 @@
 #endif
 
 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)
 
-#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)"




--- 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
-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
 #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




--- 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 \




--- 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 <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS )
+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) || defined(__FreeBSD__)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
@@ -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;




--- fileName.c.orig	Mon Nov  8 21:41:46 2004
+++ fileName.c	Sun Jan 30 18:55:53 2005
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS )
+#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS ) || defined(__FreeBSD__)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
@@ -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;

Lines 1-11 Link Here

(-)graphics/xpaint/files/patch-readWritePNG.c (-11 lines)
1	--- rw/readWritePNG.c.orig 2005-03-20 21:15:34.000000000 +0100
2	+++ rw/readWritePNG.c 2010-03-29 16:48:36.000000000 +0200
3	@@ -51,7 +51,7 @@
4	fread(header, 1, 8, fp);
5	fclose(fp);
6
7	- return png_check_sig( (unsigned char*) header, 8);
8	+ return !png_sig_cmp( (unsigned char*) header, 0, 8);
9	}
10
11




--- 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 <stdlib.h>
 #include <png.h>
 
-typedef char *String;
-#include <messages.h>
-#include <image.h>
-#include "rwTable.h"
-
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include "xpaint.h"
 
+#include <messages.h>
+#include <image.h>
+#include "rwTable.h"
+
 #ifndef TRUE
 #  define TRUE 1
 #  define FALSE 0




--- 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




--- 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




--- 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
 
 




@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
%%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%%

Return to bug 148560

Lines 6-17 Link Here

(-)graphics/xpaint/Makefile (-18 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= xpaint	8	PORTNAME= xpaint
9	PORTVERSION= 2.7.8.1	9	PORTVERSION= 2.9.1.4
10	PORTREVISION= 4
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
13	ftp://ftp.ac-grenoble.fr/Office/
14
15		12
16	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A simple paint program	14	COMMENT= A simple paint program
Lines 25-44 Link Here
25		22
26	MAN1= xpaint.1	23	MAN1= xpaint.1
27		24
28	.if defined(WITH_NEXTAW)	25	post-patch:
29	LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw	26	@${REINPLACE_CMD} -e \
30	XAW_INCDIR= ${LOCALBASE}/include/X11/neXtaw	27	's\|@PREFIX@\|${PREFIX}\|g ; \
31	XAW_LIBS= -lneXtaw	28	s\|@XPMDIR@\|${LOCALBASE}\|g ; \
32	.else	29	s\|@LOCALBASE@\|${LOCALBASE}\|g' ${WRKSRC}/Local.config
33	LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
34	XAW_INCDIR= ${LOCALBASE}/include/X11/Xaw3d
35	XAW_LIBS= -lXaw3d
36	.endif
37		30
38	pre-configure:	31	pre-configure:
39	@cd ${WRKSRC} && ${LN} -sf ${XAW_INCDIR} xaw_incdir \	32	@cd ${WRKSRC} && ${SH} ./configure xaw3dxft.a
40	&& ${ECHO_CMD} -n > Local.xawdefs \
41	&& ${ECHO_CMD} "XAWLIB_DEFINES=-DXAW3D" >> Local.xawdefs \
42	&& ${ECHO_CMD} "SYS_LIBRARIES=${XAW_LIBS}" >> Local.xawdefs
43		33
44	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)graphics/xpaint/files/patch-Imakefile (-9 / +9 lines)
1	--- Imakefile.orig Fri Jun 3 21:26:03 2005	1	--- Imakefile.orig 2010-04-07 14:37:45.000000000 +0900
2	+++ Imakefile Thu Aug 18 19:25:01 2005	2	+++ Imakefile 2010-05-29 14:06:49.000000000 +0900
3	@@ -102,7 +102,7 @@	3	@@ -94,7 +94,7 @@
4	#endif
5		4
6	DEPLIBS = always xpaint.man XPaint.ad	5	DEPLIBS = always xpaint.man XPaint.ad
7	-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
8	+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
9		6
10	SUBDIRS = rw	7	-#if ! defined(__NetBSD__) && !defined(__FreeBSD__)
11		8	+#if ! defined(NetBSDArchitecture) && !defined(FreeBSDArchitecture)
12	@@ -199,7 +199,7 @@	9	LOCAL_LIBRARIES = -Lrw -lrw -ldl -rdynamic \
		10	$(XPM_LIB) $(XFT_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
		11	#else
		12	@@ -237,7 +237,7 @@
13	XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \	13	XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
14	XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \	14	XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
15	XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"	15	XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"

Lines 1-20 Link Here

(-)graphics/xpaint/files/patch-Local.config (-19 / +47 lines)
1	--- Local.config.orig Tue Jun 3 21:56:41 2003	1	--- Local.config.orig 2010-02-23 23:11:07.000000000 +0900
2	+++ Local.config Thu Jun 12 08:06:54 2003	2	+++ Local.config 2010-06-24 05:20:52.000000000 +0900
3	@@ -161,9 +161,12 @@	3	@@ -20,9 +20,8 @@
4		4	LPCCMD = /usr/sbin/lpc status
5	#if defined(FreeBSDArchitecture)	5	#define LPCCMD
6	ARCH_DEFINES = -DHAVE_PARAM_H	6
7	-TIFF_INCLUDE = -I/usr/local/include/tiff34	7	-#if defined(__NetBSD__) \|\| defined(__FreeBSD)
8	-TIFF_LIB = -L/usr/local/lib -ltiff34	8	+#if defined(NetBSDArchitecture) \|\| defined(FreeBSDArchitecture)
9	-JPEG_INCLUDE = -I/usr/local/include	9	SHAREDIR = @PREFIX@/share/xpaint
10	-JPEG_LIB = -L/usr/local/lib -ljpeg	10	-LPCCMD = @PREFIX@/sbin/lpc status
11	-XPM_INCLUDE = -I/usr/X11R6/include/X11
12	+TIFF_INCLUDE = -I${LOCALBASE}/include
13	+TIFF_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ltiff
14	+JPEG_INCLUDE = -I${LOCALBASE}/include
15	+JPEG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -ljpeg
16	+PNG_INCLUDE = -I${LOCALBASE}/include
17	+PNG_LIB = -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lpng -lz
18	+XPM_INCLUDE = -I$(INCDIR)/X11
19	+SHAREDIR = $(LIBDIR)/xpaint
20	#endif	11	#endif
		12
		13	XCOMM Enable/disable PRINTCAP (for BSD style printing configuration)
		14	@@ -138,13 +137,13 @@
		15	XCOMM
		16
		17	XCOMM You must have the freetype2 library.
		18	-XFT_INCLUDE = -I/usr/include/freetype2
		19	-XFT_LIB = -lXft
		20	+XFT_INCLUDE = `pkg-config --cflags xft`
		21	+XFT_LIB = `pkg-config --libs xft`
		22
		23	XCOMM You must have the XPM library.
		24	XCOMM Make sure the path name to the library is correct.
		25
		26	-#if defined(__NetBSD__) \|\| defined(__FreeBSD)
		27	+#if defined(NetBSDArchitecture) \|\| defined(FreeBSDArchitecture)
		28	XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm -lX11 -lm -lXmu -lXext
		29	#else
		30	XPM_LIB = -L/usr/lib -Wl,-R/usr/lib -lXpm -lX11 -lm -lXmu -lXext
		31	@@ -152,7 +151,7 @@
		32
		33	XCOMM Make sure this points to the location of the 'xpm.h' file.
		34
		35	-#if defined(__NetBSD__) \|\| defined(__FreeBSD)
		36	+#if defined(NetBSDArchitecture) \|\| defined(FreeBSDArchitecture)
		37	XPM_INCLUDE = -I@XPMDIR@/include/X11
		38	#else
		39	XPM_INCLUDE = -I/usr/include/X11
		40	@@ -182,7 +181,7 @@
		41
		42	XCOMM This should take care of everything needed for BSD.
		43
		44	-#if defined(__NetBSD__) \|\| defined(__FreeBSD__)
		45	+#if defined(NetBSDArchitecture) \|\| defined(FreeBSDArchitecture)
		46	TIFF_INCLUDE = -I@LOCALBASE@/include
		47	TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
		48	JPEG_INCLUDE = -I@LOCALBASE@/include

Lines 1-105 Link Here

(-)graphics/xpaint/files/patch-bitmaps::Imakefile (-105 lines)
1	--- bitmaps/Imakefile.orig Thu Nov 14 19:09:21 2002
2	+++ bitmaps/Imakefile Thu Aug 18 19:33:12 2005
3	@@ -1,5 +1,101 @@
4	MISC = Imakefile
5	-SRCS = \/
6	+SRCS = \
7	+ big_tools/arcOp.xpm \
8	+ big_tools/arrowOp.xpm \
9	+ big_tools/boxOp.xpm \
10	+ big_tools/brokenlineOp.xpm \
11	+ big_tools/brushOp.xpm \
12	+ big_tools/dotPenOp.xpm \
13	+ big_tools/dynPenOp.xpm \
14	+ big_tools/eraseOp.xpm \
15	+ big_tools/fillOp.xpm \
16	+ big_tools/filledBoxOp.xpm \
17	+ big_tools/filledFreehandOp.xpm \
18	+ big_tools/filledOvalOp.xpm \
19	+ big_tools/filledPolygonOp.xpm \
20	+ big_tools/filledSplineOp.xpm \
21	+ big_tools/fractalFillOp.xpm \
22	+ big_tools/freehandOp.xpm \
23	+ big_tools/gradientFillOp.xpm \
24	+ big_tools/lineOp.xpm \
25	+ big_tools/ovalOp.xpm \
26	+ big_tools/pencilOp.xpm \
27	+ big_tools/polygonOp.xpm \
28	+ big_tools/rayOp.xpm \
29	+ big_tools/selectBoxOp.xpm \
30	+ big_tools/selectFreehandOp.xpm \
31	+ big_tools/selectOvalOp.xpm \
32	+ big_tools/selectPolygonOp.xpm \
33	+ big_tools/selectSplineOp.xpm \
34	+ big_tools/smearOp.xpm \
35	+ big_tools/splineOp.xpm \
36	+ big_tools/sprayOp.xpm \
37	+ big_tools/textOp.xpm \
38	+ brushes/paintA.xpm \
39	+ brushes/paintB.xpm \
40	+ brushes/paintC.xpm \
41	+ brushes/paintD.xpm \
42	+ brushes/paintE.xpm \
43	+ brushes/paintF.xpm \
44	+ brushes/paintG.xpm \
45	+ brushes/paintH.xpm \
46	+ brushes/paintI.xpm \
47	+ brushes/paintJ.xpm \
48	+ brushes/paintK.xpm \
49	+ brushes/paintL.xpm \
50	+ brushes/paintM.xpm \
51	+ brushes/paintN.xpm \
52	+ brushes/paintO.xpm \
53	+ brushes/paintP.xpm \
54	+ brushes/paintQ.xpm \
55	+ brushes/paintR.xpm \
56	+ brushes/paintS.xpm \
57	+ brushes/paintT.xpm \
58	+ small_tools/arcOp.xpm \
59	+ small_tools/arrowOp.xpm \
60	+ small_tools/boxOp.xpm \
61	+ small_tools/brokenlineOp.xpm \
62	+ small_tools/brushOp.xpm \
63	+ small_tools/dotPenOp.xpm \
64	+ small_tools/dynPenOp.xpm \
65	+ small_tools/eraseOp.xpm \
66	+ small_tools/fillOp.xpm \
67	+ small_tools/filledBoxOp.xpm \
68	+ small_tools/filledFreehandOp.xpm \
69	+ small_tools/filledOvalOp.xpm \
70	+ small_tools/filledPolygonOp.xpm \
71	+ small_tools/filledSplineOp.xpm \
72	+ small_tools/fractalFillOp.xpm \
73	+ small_tools/freehandOp.xpm \
74	+ small_tools/gradientFillOp.xpm \
75	+ small_tools/lineOp.xpm \
76	+ small_tools/ovalOp.xpm \
77	+ small_tools/pencilOp.xpm \
78	+ small_tools/polygonOp.xpm \
79	+ small_tools/rayOp.xpm \
80	+ small_tools/selectBoxOp.xpm \
81	+ small_tools/selectFreehandOp.xpm \
82	+ small_tools/selectOp.xpm \
83	+ small_tools/selectOvalOp.xpm \
84	+ small_tools/selectPolygonOp.xpm \
85	+ small_tools/selectSplineOp.xpm \
86	+ small_tools/smearOp.xpm \
87	+ small_tools/splineOp.xpm \
88	+ small_tools/sprayOp.xpm \
89	+ small_tools/textOp.xpm \
90	+ xbm/arrows.xbm \
91	+ xbm/background.xbm \
92	+ xbm/checkmark.xbm \
93	+ xbm/defspray.xbm \
94	+ xbm/pullright.xbm \
95	+ xbm/wait1.xbm \
96	+ xbm/wait2.xbm \
97	+ xbm/wait3.xbm \
98	+ xbm/wait4.xbm \
99	+ xpm/eye.xpm \
100	+ xpm/fill0.xpm \
101	+ xpm/fill1.xpm \
102	+ xpm/fill2.xpm
103
104	makelist:
105	sh -c 'for i in '"$(TEXT) $(SRCS) $(MISC) $(HDRS)"' ; do \

Line 0 Link Here

(-)graphics/xpaint/files/patch-fileBrowser.c (+20 lines)
	1	--- fileBrowser.c.orig 2010-04-28 17:02:11.000000000 +0900
	2	+++ fileBrowser.c 2010-05-29 13:23:51.000000000 +0900
	3	@@ -40,7 +40,7 @@
	4	#include <stdio.h>
	5	#include <sys/types.h>
	6	#include <sys/stat.h>
	7	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS )
	8	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS ) \|\| defined(__FreeBSD__)
	9	#include <dirent.h>
	10	#else
	11	#include <sys/dir.h>
	12	@@ -513,7 +513,7 @@
	13	setCWD(arg_t * arg, char *dir)
	14	{
	15	DIR *dirp;
	16	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__)
	17	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
	18	struct dirent *e;
	19	#else
	20	struct direct *e;

Lines 1-20 Link Here

(-)graphics/xpaint/files/patch-fileName.c (-20 lines)
1	--- fileName.c.orig Mon Nov 8 21:41:46 2004
2	+++ fileName.c Sun Jan 30 18:55:53 2005
3	@@ -38,7 +38,7 @@
4	#include <stdio.h>
5	#include <sys/types.h>
6	#include <sys/stat.h>
7	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS )
8	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS ) \|\| defined(__FreeBSD__)
9	#include <dirent.h>
10	#else
11	#include <sys/dir.h>
12	@@ -409,7 +409,7 @@
13	setCWD(arg_t * arg, char *dir)
14	{
15	DIR *dirp;
16	-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__)
17	+#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__)
18	struct dirent *e;
19	#else
20	struct direct *e;

Line 0 Link Here

(-)graphics/xpaint/files/patch-rw__readWritePNG.c (+22 lines)
	1	--- rw/readWritePNG.c.orig 2010-05-14 06:24:49.000000000 +0900
	2	+++ rw/readWritePNG.c 2010-06-24 04:56:04.000000000 +0900
	3	@@ -10,15 +10,14 @@
	4	#include <stdlib.h>
	5	#include <png.h>
	6
	7	-typedef char *String;
	8	-#include <messages.h>
	9	-#include <image.h>
	10	-#include "rwTable.h"
	11	-
	12	#include <X11/Xlib.h>
	13	#include <X11/Intrinsic.h>
	14	#include "xpaint.h"
	15
	16	+#include <messages.h>
	17	+#include <image.h>
	18	+#include "rwTable.h"
	19	+
	20	#ifndef TRUE
	21	# define TRUE 1
	22	# define FALSE 0

Lines 1-18 Link Here

(-)graphics/xpaint/files/patch-rw_libpnmrw.c (-11 / +4 lines)
1	--- rw/libpnmrw.c.orig Sun Apr 10 17:52:02 2005	1	--- rw/libpnmrw.c.orig 2009-12-09 05:39:15.000000000 +0900
2	+++ rw/libpnmrw.c Sun Apr 17 01:33:51 2005	2	+++ rw/libpnmrw.c 2010-05-29 13:26:56.000000000 +0900
3	@@ -131,6 +131,7 @@	3	@@ -131,7 +131,7 @@
4	static void	4	static void
5	pm_perror(char *reason)	5	pm_perror(char *reason)
6	{	6	{
		7	-#if !defined(__NetBSD__)
7	+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)	8	+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
8	#if defined(BSD4_4)	9	#if defined(BSD4_4)
9	__const extern char *__const sys_errlist[];	10	__const extern char *__const sys_errlist[];
10	#else	11	#else
11	@@ -141,6 +142,7 @@
12	#else
13	#ifdef MISSING_STRERROR
14	extern char *sys_errlist[];
15	+#endif
16	#endif
17	#endif
18	#endif

Lines 1-18 Link Here

(-)graphics/xpaint/files/patch-rw_rwTable.c (-11 / +4 lines)
1	--- rw/rwTable.c.orig Sun Apr 10 17:52:02 2005	1	--- rw/rwTable.c.orig 2010-04-09 14:27:03.000000000 +0900
2	+++ rw/rwTable.c Sun Apr 17 01:35:47 2005	2	+++ rw/rwTable.c 2010-05-29 13:28:58.000000000 +0900
3	@@ -249,6 +249,7 @@	3	@@ -296,7 +296,7 @@
4	char *	4	char *
5	RWGetMsg()	5	RWGetMsg()
6	{	6	{
		7	-#ifndef __NetBSD__
7	+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)	8	+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
8	#if defined(BSD4_4)	9	#if defined(BSD4_4)
9	__const extern char *__const sys_errlist[];	10	__const extern char *__const sys_errlist[];
10	#else	11	#else
11	@@ -258,6 +259,7 @@
12	# define sys_errlist _sys_errlist
13	#else
14	extern char *sys_errlist[];
15	+#endif
16	#endif
17	#endif
18	#endif

Line 0 Link Here

(-)graphics/xpaint/files/patch-xaw3dgxft__Imakefile (+15 lines)
	1	--- xaw3dxft/Imakefile.orig 2010-03-13 04:07:59.000000000 +0900
	2	+++ xaw3dxft/Imakefile 2010-05-29 13:57:44.000000000 +0900
	3	@@ -25,10 +25,10 @@
	4	#define IncSubSubdir Xaw3dxft
	5
	6	XCOMM When building outside an X11 source tree:
	7	-EXTRA_INCLUDES = -I. -I/usr/include/X11/Xft -I/usr/include/freetype2
	8	+EXTRA_INCLUDES = -I. `pkg-config --cflags xft`
	9
	10	#ifdef SharedXawReqs
	11	-REQUIREDLIBS = SharedXawReqs -lXft
	12	+REQUIREDLIBS = SharedXawReqs `pkg-config --libs xft`
	13	#endif
	14
	15

Lines 1-66 Link Here

(-)graphics/xpaint/pkg-plist (-61 / +125 lines)
1	@comment $FreeBSD: ports/graphics/xpaint/pkg-plist,v 1.8 2004/08/28 06:32:20 krion Exp $	1	@comment $FreeBSD: ports/graphics/xpaint/pkg-plist,v 1.8 2004/08/28 06:32:20 krion Exp $
		2	bin/imgmerge
		3	bin/pdfconcat
2	bin/xpaint	4	bin/xpaint
3	lib/X11/app-defaults/XPaint	5	lib/X11/app-defaults/XPaint
4	lib/X11/app-defaults/XPaint_es	6	lib/X11/app-defaults/XPaint_es
5	lib/X11/app-defaults/XPaint_fr	7	lib/X11/app-defaults/XPaint_fr
6	lib/X11/xpaint/XPaintIcon.xpm	8	%%DATADIR%%/XPaintIcon.xpm
7	lib/X11/xpaint/c_scripts/3d_curves/helicoid.c	9	%%DATADIR%%/bin/xpaint_ocr
8	lib/X11/xpaint/c_scripts/3d_curves/lissajous.c	10	%%DATADIR%%/bitmaps/brushbox.cfg
9	lib/X11/xpaint/c_scripts/3d_surfaces/ellipsoid.c	11	%%DATADIR%%/bitmaps/brushes/paint0.xpm
10	lib/X11/xpaint/c_scripts/3d_surfaces/heart.c	12	%%DATADIR%%/bitmaps/brushes/paint1.xpm
11	lib/X11/xpaint/c_scripts/3d_surfaces/hyperboloid.c	13	%%DATADIR%%/bitmaps/brushes/paint2.xpm
12	lib/X11/xpaint/c_scripts/3d_surfaces/polyhedra.c	14	%%DATADIR%%/bitmaps/brushes/paint3.xpm
13	lib/X11/xpaint/c_scripts/3d_surfaces/torus.c	15	%%DATADIR%%/bitmaps/brushes/paint4.xpm
14	lib/X11/xpaint/c_scripts/3d_surfaces/trefoil.c	16	%%DATADIR%%/bitmaps/brushes/paint5.xpm
15	lib/X11/xpaint/c_scripts/3d_surfaces/waves.c	17	%%DATADIR%%/bitmaps/brushes/paint6.xpm
16	lib/X11/xpaint/c_scripts/filters/leftright.c	18	%%DATADIR%%/bitmaps/brushes/paintA.xpm
17	lib/X11/xpaint/c_scripts/filters/mapping.c	19	%%DATADIR%%/bitmaps/brushes/paintB.xpm
18	lib/X11/xpaint/c_scripts/filters/merge.c	20	%%DATADIR%%/bitmaps/brushes/paintC.xpm
19	lib/X11/xpaint/c_scripts/filters/permute.c	21	%%DATADIR%%/bitmaps/brushes/paintD.xpm
20	lib/X11/xpaint/c_scripts/filters/rotleft.c	22	%%DATADIR%%/bitmaps/brushes/paintE.xpm
21	lib/X11/xpaint/c_scripts/filters/rotright.c	23	%%DATADIR%%/bitmaps/brushes/paintF.xpm
22	lib/X11/xpaint/c_scripts/filters/updown.c	24	%%DATADIR%%/bitmaps/brushes/paintG.xpm
23	lib/X11/xpaint/c_scripts/images/random.c	25	%%DATADIR%%/bitmaps/brushes/paintH.xpm
24	lib/X11/xpaint/c_scripts/layers/combine.c	26	%%DATADIR%%/bitmaps/brushes/paintI.xpm
25	lib/X11/xpaint/c_scripts/procedures/setmemory.c	27	%%DATADIR%%/bitmaps/brushes/paintJ.xpm
26	lib/X11/xpaint/help/Help	28	%%DATADIR%%/bitmaps/brushes/paintK.xpm
27	lib/X11/xpaint/help/Help_es	29	%%DATADIR%%/bitmaps/brushes/paintL.xpm
28	lib/X11/xpaint/help/Help_fr	30	%%DATADIR%%/bitmaps/brushes/paintM.xpm
29	lib/X11/xpaint/include/Colormap.h	31	%%DATADIR%%/bitmaps/brushes/paintN.xpm
30	lib/X11/xpaint/include/ColormapP.h	32	%%DATADIR%%/bitmaps/brushes/paintO.xpm
31	lib/X11/xpaint/include/DefaultRC.txt.h	33	%%DATADIR%%/bitmaps/brushes/paintP.xpm
32	lib/X11/xpaint/include/Paint.h	34	%%DATADIR%%/bitmaps/brushes/paintQ.xpm
33	lib/X11/xpaint/include/PaintP.h	35	%%DATADIR%%/bitmaps/brushes/paintR.xpm
34	lib/X11/xpaint/include/XPaint.ad.h	36	%%DATADIR%%/bitmaps/brushes/paintS.xpm
35	lib/X11/xpaint/include/Xpaint.h	37	%%DATADIR%%/bitmaps/brushes/paintT.xpm
36	lib/X11/xpaint/include/Xpaint3d.h	38	%%DATADIR%%/bitmaps/brushes/paintU.xpm
37	lib/X11/xpaint/include/color.h	39	%%DATADIR%%/bitmaps/brushes/paintV.xpm
38	lib/X11/xpaint/include/graphic.h	40	%%DATADIR%%/bitmaps/brushes/paintW.xpm
39	lib/X11/xpaint/include/hash.h	41	%%DATADIR%%/bitmaps/brushes/paintX.xpm
40	lib/X11/xpaint/include/image.h	42	%%DATADIR%%/bitmaps/brushes/paintY.xpm
41	lib/X11/xpaint/include/menu.h	43	%%DATADIR%%/bitmaps/brushes/paintZ.xpm
42	lib/X11/xpaint/include/messages.h	44	%%DATADIR%%/bitmaps/elec/busH.xpm
43	lib/X11/xpaint/include/misc.h	45	%%DATADIR%%/bitmaps/elec/busV.xpm
44	lib/X11/xpaint/include/operation.h	46	%%DATADIR%%/bitmaps/elec/capH.xpm
45	lib/X11/xpaint/include/ops.h	47	%%DATADIR%%/bitmaps/elec/capV.xpm
46	lib/X11/xpaint/include/palette.h	48	%%DATADIR%%/bitmaps/elec/coilV.xpm
47	lib/X11/xpaint/include/patchlevel.h	49	%%DATADIR%%/bitmaps/elec/dioV.xpm
48	lib/X11/xpaint/include/protocol.h	50	%%DATADIR%%/bitmaps/elec/fetV.xpm
49	lib/X11/xpaint/include/rc.h	51	%%DATADIR%%/bitmaps/elec/grid.xpm
50	lib/X11/xpaint/include/region.h	52	%%DATADIR%%/bitmaps/elec/op_amp.xpm
51	lib/X11/xpaint/include/text.h	53	%%DATADIR%%/bitmaps/elec/resH.xpm
52	lib/X11/xpaint/include/xpaint.h	54	%%DATADIR%%/bitmaps/elec/resV.xpm
53	lib/X11/xpaint/messages/Messages	55	%%DATADIR%%/bitmaps/elec/tfxV.xpm
54	lib/X11/xpaint/messages/Messages_es	56	%%DATADIR%%/bitmaps/elec/traV.xpm
55	lib/X11/xpaint/messages/Messages_fr	57	%%DATADIR%%/c_scripts/3d_curves/helicoid.c
56	@dirrm lib/X11/xpaint/messages	58	%%DATADIR%%/c_scripts/3d_curves/lissajous.c
57	@dirrm lib/X11/xpaint/help	59	%%DATADIR%%/c_scripts/3d_surfaces/ellipsoid.c
58	@dirrm lib/X11/xpaint/include	60	%%DATADIR%%/c_scripts/3d_surfaces/genre_g.c
59	@dirrm lib/X11/xpaint/c_scripts/procedures	61	%%DATADIR%%/c_scripts/3d_surfaces/heart.c
60	@dirrm lib/X11/xpaint/c_scripts/layers	62	%%DATADIR%%/c_scripts/3d_surfaces/hyperboloid.c
61	@dirrm lib/X11/xpaint/c_scripts/images	63	%%DATADIR%%/c_scripts/3d_surfaces/polyhedra.c
62	@dirrm lib/X11/xpaint/c_scripts/filters	64	%%DATADIR%%/c_scripts/3d_surfaces/torus.c
63	@dirrm lib/X11/xpaint/c_scripts/3d_surfaces	65	%%DATADIR%%/c_scripts/3d_surfaces/trefoil.c
64	@dirrm lib/X11/xpaint/c_scripts/3d_curves	66	%%DATADIR%%/c_scripts/3d_surfaces/waves.c
65	@dirrm lib/X11/xpaint/c_scripts	67	%%DATADIR%%/c_scripts/batch/batch.c
66	@dirrm lib/X11/xpaint	68	%%DATADIR%%/c_scripts/filters/clean.c
		69	%%DATADIR%%/c_scripts/filters/leftright.c
		70	%%DATADIR%%/c_scripts/filters/mapping.c
		71	%%DATADIR%%/c_scripts/filters/merge.c
		72	%%DATADIR%%/c_scripts/filters/permute.c
		73	%%DATADIR%%/c_scripts/filters/rotleft.c
		74	%%DATADIR%%/c_scripts/filters/rotright.c
		75	%%DATADIR%%/c_scripts/filters/updown.c
		76	%%DATADIR%%/c_scripts/images/alpha_test.c
		77	%%DATADIR%%/c_scripts/images/rgb_test.c
		78	%%DATADIR%%/c_scripts/layers/combine.c
		79	%%DATADIR%%/c_scripts/procedures/proc_with_params.c
		80	%%DATADIR%%/c_scripts/procedures/setmemory.c
		81	%%DATADIR%%/c_scripts/templates/image.c
		82	%%DATADIR%%/help/Help
		83	%%DATADIR%%/help/Help_es
		84	%%DATADIR%%/help/Help_fr
		85	%%DATADIR%%/include/Colormap.h
		86	%%DATADIR%%/include/ColormapP.h
		87	%%DATADIR%%/include/DefaultRC.txt.h
		88	%%DATADIR%%/include/Paint.h
		89	%%DATADIR%%/include/PaintP.h
		90	%%DATADIR%%/include/XPaint.ad.h
		91	%%DATADIR%%/include/Xpaint.h
		92	%%DATADIR%%/include/Xpaint3d.h
		93	%%DATADIR%%/include/color.h
		94	%%DATADIR%%/include/crc32.h
		95	%%DATADIR%%/include/graphic.h
		96	%%DATADIR%%/include/hash.h
		97	%%DATADIR%%/include/image.h
		98	%%DATADIR%%/include/menu.h
		99	%%DATADIR%%/include/messages.h
		100	%%DATADIR%%/include/misc.h
		101	%%DATADIR%%/include/operation.h
		102	%%DATADIR%%/include/ops.h
		103	%%DATADIR%%/include/palette.h
		104	%%DATADIR%%/include/patchlevel.h
		105	%%DATADIR%%/include/print.h
		106	%%DATADIR%%/include/protocol.h
		107	%%DATADIR%%/include/rc.h
		108	%%DATADIR%%/include/region.h
		109	%%DATADIR%%/include/text.h
		110	%%DATADIR%%/include/xpaint.h
		111	%%DATADIR%%/messages/Messages
		112	%%DATADIR%%/messages/Messages_es
		113	%%DATADIR%%/messages/Messages_fr
		114	@dirrm %%DATADIR%%/messages
		115	@dirrm %%DATADIR%%/include
		116	@dirrm %%DATADIR%%/help
		117	@dirrm %%DATADIR%%/c_scripts/templates
		118	@dirrm %%DATADIR%%/c_scripts/procedures
		119	@dirrm %%DATADIR%%/c_scripts/layers
		120	@dirrm %%DATADIR%%/c_scripts/images
		121	@dirrm %%DATADIR%%/c_scripts/filters
		122	@dirrm %%DATADIR%%/c_scripts/batch
		123	@dirrm %%DATADIR%%/c_scripts/3d_surfaces
		124	@dirrm %%DATADIR%%/c_scripts/3d_curves
		125	@dirrm %%DATADIR%%/c_scripts
		126	@dirrm %%DATADIR%%/bitmaps/elec
		127	@dirrm %%DATADIR%%/bitmaps/brushes
		128	@dirrm %%DATADIR%%/bitmaps
		129	@dirrm %%DATADIR%%/bin
		130	@dirrm %%DATADIR%%