Attachment #56549 for bug #85384

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




#

PORTNAME=	xpaint
PORTVERSION=	2.7.8
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		ftp://ftp.ac-grenoble.fr/Office/


.if defined(WITH_NEXTAW)
LIB_DEPENDS+=	neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
ALL_TARGET=	nextaw
XAW_INCDIR=	${X11BASE}/include/X11/neXtaw
XAW_LIBS=	-lneXtaw
.else
LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
ALL_TARGET=	xaw3d
XAW_INCDIR=	${X11BASE}/include/X11/Xaw3d
XAW_LIBS=	-lXaw3d
.endif

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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/xpaint/distinfo (-2 / +2 lines)
1	MD5 (xpaint-2.7.7.tar.bz2) = e6086b87adf5bac8e6d207248b760eff	1	MD5 (xpaint-2.7.8.tar.bz2) = 4e0e33dda17b77477fcafbef44848562
2	SIZE (xpaint-2.7.7.tar.bz2) = 403208	2	SIZE (xpaint-2.7.8.tar.bz2) = 415855




--- Imakefile.orig	Fri Jun  3 21:26:03 2005
+++ Imakefile	Thu Aug 18 19:25:01 2005
@@ -102,7 +102,7 @@
 #endif
 

 
 SUBDIRS = rw
 
@@ -199,7 +199,7 @@
 
 xaw::
 	-$(RM) $(XAWDEPENDS)
-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw xaw_incdir
 	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
 	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
 	xmkmf -a ; make
@@ -164,7 +164,7 @@
 
 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
@@ -175,7 +175,7 @@
 	
 xaw3dg::
 	-$(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 -DXAW3DG" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
 	xmkmf ; cd rw ; xmkmf ; cd .. ; make
@@ -186,7 +186,7 @@
 
 nextaw::
 	-$(RM) $(XAWDEPENDS)
-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/neXtaw xaw_incdir	
+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/neXtaw xaw_incdir	
 	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lneXtaw -L." >> Local.xawdefs
 	xmkmf ; cd rw ; xmkmf ; cd .. ; make
@@ -197,7 +197,7 @@
 
 xaw95::
 	-$(RM) $(XAWDEPENDS)
-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw95 xaw_incdir	
+	-$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw95 xaw_incdir	
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
 	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
 	xmkmf -a ; make
@@ -229,7 +229,7 @@
 		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
 		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"




--- 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/clineOp.xpm \
+	big_tools/dotPenOp.xpm \
+	big_tools/dynPenOp.xpm \
+	big_tools/eraseOp.xpm \
+	big_tools/fboxOp.xpm \
+	big_tools/ffillOp.xpm \
+	big_tools/ffreehandOp.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/lassoOp.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 \
+	big_tools/tfillOp.xpm \
+	brushes/paintA.xpm \
+	brushes/paintB.xpm \
+	brushes/paintC.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/clineOp.xpm \
+	small_tools/dotPenOp.xpm \
+	small_tools/dynPenOp.xpm \
+	small_tools/eraseOp.xpm \
+	small_tools/fboxOp.xpm \
+	small_tools/ffillOp.xpm \
+	small_tools/ffreehandOp.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/lassoOp.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 \
+	small_tools/tfillOp.xpm \
+	xbm/arrows.xbm \
+	xbm/background.xbm \
+	xbm/checkmark.xbm \

Return to bug 85384

Lines 6-12 Link Here

(-)graphics/xpaint/Makefile (-4 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= xpaint	8	PORTNAME= xpaint
9	PORTVERSION= 2.7.7	9	PORTVERSION= 2.7.8
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
12	ftp://ftp.ac-grenoble.fr/Office/	12	ftp://ftp.ac-grenoble.fr/Office/
Lines 26-40 Link Here
26		26
27	.if defined(WITH_NEXTAW)	27	.if defined(WITH_NEXTAW)
28	LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw	28	LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
29	ALL_TARGET= nextaw
30	XAW_INCDIR= ${X11BASE}/include/X11/neXtaw	29	XAW_INCDIR= ${X11BASE}/include/X11/neXtaw
		30	XAW_LIBS= -lneXtaw
31	.else	31	.else
32	LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d	32	LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
33	ALL_TARGET= xaw3d
34	XAW_INCDIR= ${X11BASE}/include/X11/Xaw3d	33	XAW_INCDIR= ${X11BASE}/include/X11/Xaw3d
		34	XAW_LIBS= -lXaw3d
35	.endif	35	.endif
36		36
37	pre-configure:	37	pre-configure:
38	@cd ${WRKSRC} && ${LN} -sf ${XAW_INCDIR} xaw_incdir	38	@cd ${WRKSRC} && ${LN} -sf ${XAW_INCDIR} xaw_incdir \
		39	&& ${ECHO_CMD} -n > Local.xawdefs \
		40	&& ${ECHO_CMD} "XAWLIB_DEFINES=-DXAW3D" >> Local.xawdefs \
		41	&& ${ECHO_CMD} "SYS_LIBRARIES=${XAW_LIBS}" >> Local.xawdefs
39		42
40	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)graphics/xpaint/files/patch-Imakefile (-48 / +3 lines)
1	--- Imakefile.orig Thu Apr 28 05:59:37 2005	1	--- Imakefile.orig Fri Jun 3 21:26:03 2005
2	+++ Imakefile Mon May 9 00:54:49 2005	2	+++ Imakefile Thu Aug 18 19:25:01 2005
3	@@ -102,7 +102,7 @@	3	@@ -102,7 +102,7 @@
4	#endif	4	#endif
5		5
Lines 9-60 Link Here
9		9
10	SUBDIRS = rw	10	SUBDIRS = rw
11		11
12	@@ -152,7 +152,7 @@	12	@@ -199,7 +199,7 @@
13
14	xaw::
15	-$(RM) $(XAWDEPENDS)
16	- -$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
17	+ -$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw xaw_incdir
18	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs
19	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
20	xmkmf -a ; make
21	@@ -164,7 +164,7 @@
22
23	xaw3d::
24	-$(RM) $(XAWDEPENDS)
25	- -$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw3d xaw_incdir
26	+ -$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw3d xaw_incdir
27	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
28	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
29	xmkmf ; cd rw ; xmkmf ; cd .. ; make
30	@@ -175,7 +175,7 @@
31
32	xaw3dg::
33	-$(RM) $(XAWDEPENDS)
34	- -$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw3d xaw_incdir
35	+ -$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw3d xaw_incdir
36	echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" > Local.xawdefs
37	echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
38	xmkmf ; cd rw ; xmkmf ; cd .. ; make
39	@@ -186,7 +186,7 @@
40
41	nextaw::
42	-$(RM) $(XAWDEPENDS)
43	- -$(RM) xaw_incdir ; ln -sf /usr/include/X11/neXtaw xaw_incdir
44	+ -$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/neXtaw xaw_incdir
45	echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
46	echo "SYS_LIBRARIES = -lneXtaw -L." >> Local.xawdefs
47	xmkmf ; cd rw ; xmkmf ; cd .. ; make
48	@@ -197,7 +197,7 @@
49
50	xaw95::
51	-$(RM) $(XAWDEPENDS)
52	- -$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw95 xaw_incdir
53	+ -$(RM) xaw_incdir ; ln -sf $(INCDIR)/X11/Xaw95 xaw_incdir
54	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
55	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
56	xmkmf -a ; make
57	@@ -229,7 +229,7 @@
58	XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \	13	XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
59	XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \	14	XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
60	XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"	15	XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"

Lines 1-37 Link Here

(-)graphics/xpaint/files/patch-bitmaps::Imakefile (-25 / +32 lines)
1	--- bitmaps/Imakefile.orig Thu Nov 14 19:09:21 2002	1	--- bitmaps/Imakefile.orig Thu Nov 14 19:09:21 2002
2	+++ bitmaps/Imakefile Sat Aug 28 03:01:01 2004	2	+++ bitmaps/Imakefile Thu Aug 18 19:33:12 2005
3	@@ -1,5 +1,94 @@	3	@@ -1,5 +1,101 @@
4	MISC = Imakefile	4	MISC = Imakefile
5	-SRCS = \/	5	-SRCS = \/
6	+SRCS = \	6	+SRCS = \
7	+ big_tools/arcOp.xpm \	7	+ big_tools/arcOp.xpm \
		8	+ big_tools/arrowOp.xpm \
8	+ big_tools/boxOp.xpm \	9	+ big_tools/boxOp.xpm \
		10	+ big_tools/brokenlineOp.xpm \
9	+ big_tools/brushOp.xpm \	11	+ big_tools/brushOp.xpm \
10	+ big_tools/clineOp.xpm \
11	+ big_tools/dotPenOp.xpm \	12	+ big_tools/dotPenOp.xpm \
12	+ big_tools/dynPenOp.xpm \	13	+ big_tools/dynPenOp.xpm \
13	+ big_tools/eraseOp.xpm \	14	+ big_tools/eraseOp.xpm \
14	+ big_tools/fboxOp.xpm \
15	+ big_tools/ffillOp.xpm \
16	+ big_tools/ffreehandOp.xpm \
17	+ big_tools/fillOp.xpm \	15	+ big_tools/fillOp.xpm \
18	+ big_tools/fovalOp.xpm \	16	+ big_tools/filledBoxOp.xpm \
19	+ big_tools/fpolyOp.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 \
20	+ big_tools/freehandOp.xpm \	22	+ big_tools/freehandOp.xpm \
21	+ big_tools/fsplineOp.xpm \	23	+ big_tools/gradientFillOp.xpm \
22	+ big_tools/lassoOp.xpm \
23	+ big_tools/lineOp.xpm \	24	+ big_tools/lineOp.xpm \
24	+ big_tools/ovalOp.xpm \	25	+ big_tools/ovalOp.xpm \
25	+ big_tools/pencilOp.xpm \	26	+ big_tools/pencilOp.xpm \
26	+ big_tools/polyOp.xpm \	27	+ big_tools/polygonOp.xpm \
27	+ big_tools/rayOp.xpm \	28	+ big_tools/rayOp.xpm \
28	+ big_tools/selectOp.xpm \	29	+ big_tools/selectBoxOp.xpm \
29	+ big_tools/selpolyOp.xpm \	30	+ big_tools/selectFreehandOp.xpm \
		31	+ big_tools/selectOvalOp.xpm \
		32	+ big_tools/selectPolygonOp.xpm \
		33	+ big_tools/selectSplineOp.xpm \
30	+ big_tools/smearOp.xpm \	34	+ big_tools/smearOp.xpm \
31	+ big_tools/splineOp.xpm \	35	+ big_tools/splineOp.xpm \
32	+ big_tools/sprayOp.xpm \	36	+ big_tools/sprayOp.xpm \
33	+ big_tools/textOp.xpm \	37	+ big_tools/textOp.xpm \
34	+ big_tools/tfillOp.xpm \
35	+ brushes/paintA.xpm \	38	+ brushes/paintA.xpm \
36	+ brushes/paintB.xpm \	39	+ brushes/paintB.xpm \
37	+ brushes/paintC.xpm \	40	+ brushes/paintC.xpm \
Lines 53-85 Link Here
53	+ brushes/paintS.xpm \	56	+ brushes/paintS.xpm \
54	+ brushes/paintT.xpm \	57	+ brushes/paintT.xpm \
55	+ small_tools/arcOp.xpm \	58	+ small_tools/arcOp.xpm \
		59	+ small_tools/arrowOp.xpm \
56	+ small_tools/boxOp.xpm \	60	+ small_tools/boxOp.xpm \
		61	+ small_tools/brokenlineOp.xpm \
57	+ small_tools/brushOp.xpm \	62	+ small_tools/brushOp.xpm \
58	+ small_tools/clineOp.xpm \
59	+ small_tools/dotPenOp.xpm \	63	+ small_tools/dotPenOp.xpm \
60	+ small_tools/dynPenOp.xpm \	64	+ small_tools/dynPenOp.xpm \
61	+ small_tools/eraseOp.xpm \	65	+ small_tools/eraseOp.xpm \
62	+ small_tools/fboxOp.xpm \
63	+ small_tools/ffillOp.xpm \
64	+ small_tools/ffreehandOp.xpm \
65	+ small_tools/fillOp.xpm \	66	+ small_tools/fillOp.xpm \
66	+ small_tools/fovalOp.xpm \	67	+ small_tools/filledBoxOp.xpm \
67	+ small_tools/fpolyOp.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 \
68	+ small_tools/freehandOp.xpm \	73	+ small_tools/freehandOp.xpm \
69	+ small_tools/fsplineOp.xpm \	74	+ small_tools/gradientFillOp.xpm \
70	+ small_tools/lassoOp.xpm \
71	+ small_tools/lineOp.xpm \	75	+ small_tools/lineOp.xpm \
72	+ small_tools/ovalOp.xpm \	76	+ small_tools/ovalOp.xpm \
73	+ small_tools/pencilOp.xpm \	77	+ small_tools/pencilOp.xpm \
74	+ small_tools/polyOp.xpm \	78	+ small_tools/polygonOp.xpm \
75	+ small_tools/rayOp.xpm \	79	+ small_tools/rayOp.xpm \
		80	+ small_tools/selectBoxOp.xpm \
		81	+ small_tools/selectFreehandOp.xpm \
76	+ small_tools/selectOp.xpm \	82	+ small_tools/selectOp.xpm \
77	+ small_tools/selpolyOp.xpm \	83	+ small_tools/selectOvalOp.xpm \
		84	+ small_tools/selectPolygonOp.xpm \
		85	+ small_tools/selectSplineOp.xpm \
78	+ small_tools/smearOp.xpm \	86	+ small_tools/smearOp.xpm \
79	+ small_tools/splineOp.xpm \	87	+ small_tools/splineOp.xpm \
80	+ small_tools/sprayOp.xpm \	88	+ small_tools/sprayOp.xpm \
81	+ small_tools/textOp.xpm \	89	+ small_tools/textOp.xpm \
82	+ small_tools/tfillOp.xpm \
83	+ xbm/arrows.xbm \	90	+ xbm/arrows.xbm \
84	+ xbm/background.xbm \	91	+ xbm/background.xbm \
85	+ xbm/checkmark.xbm \	92	+ xbm/checkmark.xbm \