Attachment 52462 Details for Bug 79477 – file.diff

[patch] file.diff

file.diff (text/plain), 3.92 KB, created by tkato432 on 2005-04-02 18:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-04-02 18:10:16 UTC

Size: 3.92 KB

patch

obsolete

>diff -urN /usr/ports/graphics/xpaint/Makefile graphics/xpaint/Makefile
>--- /usr/ports/graphics/xpaint/Makefile	Wed Mar 16 02:23:35 2005
>+++ graphics/xpaint/Makefile	Thu Mar 31 10:19:39 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xpaint
>-PORTVERSION=	2.7.4
>+PORTVERSION=	2.7.6
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		ftp://ftp.ac-grenoble.fr/Office/
>@@ -16,17 +16,27 @@
> COMMENT=	A simple paint program
> 
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
>-		tiff.4:${PORTSDIR}/graphics/tiff \
>-		Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
>+		tiff.4:${PORTSDIR}/graphics/tiff
> 
> USE_BZIP2=	yes
> USE_IMAKE=	yes
> USE_XPM=	yes
>-ALL_TARGET=	xaw3d
> 
> MAN1=		xpaint.1
> 
>+CFLAGS+=	-DARROW_SCROLLBAR
>+
>+.if defined(WITH_NEXTAW)
>+LIB_DEPENDS+=	neXtaw.${XAWVER}:${PORTSDIR}/x11-toolkits/neXtaw
>+ALL_TARGET=	nextaw
>+XAW_INCDIR=	${X11BASE}/include/X11/neXtaw
>+.else
>+LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
>+ALL_TARGET=	xaw3d
>+XAW_INCDIR=	${X11BASE}/include/X11/Xaw3d
>+.endif
>+
> pre-configure:
>-	@cd ${WRKSRC} && ${LN} -sf ${X11BASE}/include/X11/Xaw3d xaw_incdir
>+	@cd ${WRKSRC} && ${LN} -sf ${XAW_INCDIR} xaw_incdir
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/xpaint/distinfo graphics/xpaint/distinfo
>--- /usr/ports/graphics/xpaint/distinfo	Wed Mar 16 02:23:35 2005
>+++ graphics/xpaint/distinfo	Thu Mar 31 10:26:44 2005
>@@ -1,2 +1,2 @@
>-MD5 (xpaint-2.7.4.tar.bz2) = 69d8956cbbf9f2abb852e44770b636db
>-SIZE (xpaint-2.7.4.tar.bz2) = 378090
>+MD5 (xpaint-2.7.6.tar.bz2) = ecba3402cbb6404d238021cdaadcadf9
>+SIZE (xpaint-2.7.6.tar.bz2) = 378529
>diff -urN /usr/ports/graphics/xpaint/files/patch-Imakefile graphics/xpaint/files/patch-Imakefile
>--- /usr/ports/graphics/xpaint/files/patch-Imakefile	Wed Mar 16 02:23:35 2005
>+++ graphics/xpaint/files/patch-Imakefile	Mon Mar 21 13:28:56 2005
>@@ -1,6 +1,6 @@
>---- Imakefile.orig	Mon Mar 14 05:42:26 2005
>-+++ Imakefile	Mon Mar 14 20:22:16 2005
>-@@ -101,7 +101,7 @@
>+--- Imakefile.orig	Sun Mar 20 06:37:39 2005
>++++ Imakefile	Mon Mar 21 13:27:05 2005
>+@@ -98,7 +98,7 @@
>  #endif
>  
>  DEPLIBS = always xpaint.man XPaint.ad
>@@ -9,16 +9,52 @@
>  
>  SUBDIRS = rw
>  
>-@@ -163,7 +163,7 @@
>+@@ -148,7 +148,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
>+@@ -160,7 +160,7 @@
>  
>  xaw3d::
>- 	-$(RM) $(XAW3DDEPENDS)
>+ 	-$(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
>-@@ -219,7 +219,7 @@
>+@@ -171,7 +171,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
>+@@ -182,7 +182,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
>+@@ -193,7 +193,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
>+@@ -225,7 +225,7 @@
>  		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
>  		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
>  		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"

Actions: View | Diff

Attachments on bug 79477: 52462