Attachment 56549 Details for Bug 85384 – file.diff

[patch] file.diff

file.diff (text/plain), 6.91 KB, created by tkato432 on 2005-08-28 11:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-08-28 11:10:18 UTC

Size: 6.91 KB

patch

obsolete

>diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile
>--- /usr/ports/graphics/xpaint/Makefile	Thu May 19 01:57:46 2005
>+++ graphics/xpaint/Makefile	Sat Aug 20 15:52:18 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xpaint
>-PORTVERSION=	2.7.7
>+PORTVERSION=	2.7.8
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		ftp://ftp.ac-grenoble.fr/Office/
>@@ -26,15 +26,18 @@
> 
> .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
>+	@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>
>diff -urN /usr/ports/graphics/xpaint/distinfo graphics/xpaint/distinfo
>--- /usr/ports/graphics/xpaint/distinfo	Thu May 19 01:57:46 2005
>+++ graphics/xpaint/distinfo	Thu Aug 18 18:15:50 2005
>@@ -1,2 +1,2 @@
>-MD5 (xpaint-2.7.7.tar.bz2) = e6086b87adf5bac8e6d207248b760eff
>-SIZE (xpaint-2.7.7.tar.bz2) = 403208
>+MD5 (xpaint-2.7.8.tar.bz2) = 4e0e33dda17b77477fcafbef44848562
>+SIZE (xpaint-2.7.8.tar.bz2) = 415855
>diff -urN /usr/ports/graphics/xpaint/files/patch-Imakefile graphics/xpaint/files/patch-Imakefile
>--- /usr/ports/graphics/xpaint/files/patch-Imakefile	Thu May 19 01:57:46 2005
>+++ graphics/xpaint/files/patch-Imakefile	Thu Aug 18 19:25:13 2005
>@@ -1,5 +1,5 @@
>---- Imakefile.orig	Thu Apr 28 05:59:37 2005
>-+++ Imakefile	Mon May  9 00:54:49 2005
>+--- Imakefile.orig	Fri Jun  3 21:26:03 2005
>++++ Imakefile	Thu Aug 18 19:25:01 2005
> @@ -102,7 +102,7 @@
>  #endif
>  
>@@ -9,52 +9,7 @@
>  
>  SUBDIRS = rw
>  
>-@@ -152,7 +152,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 @@
>+@@ -199,7 +199,7 @@
>  		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
>  		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
>  		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
>diff -urN /usr/ports/graphics/xpaint/files/patch-bitmaps::Imakefile graphics/xpaint/files/patch-bitmaps::Imakefile
>--- /usr/ports/graphics/xpaint/files/patch-bitmaps::Imakefile	Sat Aug 28 15:32:20 2004
>+++ graphics/xpaint/files/patch-bitmaps::Imakefile	Thu Aug 18 19:38:21 2005
>@@ -1,37 +1,40 @@
> --- bitmaps/Imakefile.orig	Thu Nov 14 19:09:21 2002
>-+++ bitmaps/Imakefile	Sat Aug 28 03:01:01 2004
>-@@ -1,5 +1,94 @@
>++++ 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/fovalOp.xpm \
>-+	big_tools/fpolyOp.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/fsplineOp.xpm \
>-+	big_tools/lassoOp.xpm \
>++	big_tools/gradientFillOp.xpm \
> +	big_tools/lineOp.xpm \
> +	big_tools/ovalOp.xpm \
> +	big_tools/pencilOp.xpm \
>-+	big_tools/polyOp.xpm \
>++	big_tools/polygonOp.xpm \
> +	big_tools/rayOp.xpm \
>-+	big_tools/selectOp.xpm \
>-+	big_tools/selpolyOp.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 \
>@@ -53,33 +56,37 @@
> +	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/fovalOp.xpm \
>-+	small_tools/fpolyOp.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/fsplineOp.xpm \
>-+	small_tools/lassoOp.xpm \
>++	small_tools/gradientFillOp.xpm \
> +	small_tools/lineOp.xpm \
> +	small_tools/ovalOp.xpm \
> +	small_tools/pencilOp.xpm \
>-+	small_tools/polyOp.xpm \
>++	small_tools/polygonOp.xpm \
> +	small_tools/rayOp.xpm \
>++	small_tools/selectBoxOp.xpm \
>++	small_tools/selectFreehandOp.xpm \
> +	small_tools/selectOp.xpm \
>-+	small_tools/selpolyOp.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 \

Actions: View | Diff

Attachments on bug 85384: 56549