- Update to 2.7.4

PR:		ports/78881
Submitted by:	Ports Fury

graphics/xpaint/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpaint
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ac-grenoble.fr/Office/
@@ -15,14 +15,18 @@ MASTER_SITE_SUBDIR=	sf-${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple paint program
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_BZIP2=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
-ALL_TARGET=	xaw95static
+ALL_TARGET=	xaw3d
 
 MAN1=		xpaint.1
 
+pre-configure:
+	@cd ${WRKSRC} && ${LN} -sf ${X11BASE}/include/X11/Xaw3d xaw_incdir
+
 .include <bsd.port.mk>

graphics/xpaint/distinfo

@@ -1,2 +1,2 @@
-MD5 (xpaint-2.7.3.tar.bz2) = acfdb2c7faeb3124988727727a41672d
-SIZE (xpaint-2.7.3.tar.bz2) = 615007
+MD5 (xpaint-2.7.4.tar.bz2) = 69d8956cbbf9f2abb852e44770b636db
+SIZE (xpaint-2.7.4.tar.bz2) = 378090

graphics/xpaint/files/patch-Imakefile

@@ -1,6 +1,6 @@
---- Imakefile.orig	Sun Aug 22 00:15:08 2004
-+++ Imakefile	Sat Aug 28 02:46:25 2004
-@@ -90,7 +90,7 @@
+--- Imakefile.orig	Mon Mar 14 05:42:26 2005
++++ Imakefile	Mon Mar 14 20:22:16 2005
+@@ -101,7 +101,7 @@
  #endif
  
  DEPLIBS = always xpaint.man XPaint.ad
@@ -9,7 +9,16 @@
  
  SUBDIRS = rw
  
-@@ -172,7 +172,7 @@
+@@ -163,7 +163,7 @@
+ 
+ xaw3d::
+ 	-$(RM) $(XAW3DDEPENDS)
+-	-$(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 @@
  		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
  		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
  		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"