svn commit: r311026 - in head/graphics/xpaint: . files

[Johan van Selst]

Author: johans
Date: Sat Jan 26 16:30:12 2013
New Revision: 311026
URL: http://svnweb.freebsd.org/changeset/ports/311026

Log:
  - Update xpaint to 2.9.9.3
  - Remove some local patch files that are no longer needed

Deleted:
  head/graphics/xpaint/files/patch-fileBrowser.c
  head/graphics/xpaint/files/patch-rw__readWritePNG.c
  head/graphics/xpaint/files/patch-rw_libpnmrw.c
  head/graphics/xpaint/files/patch-rw_readWriteICO.c
Modified:
  head/graphics/xpaint/Makefile
  head/graphics/xpaint/distinfo

Modified: head/graphics/xpaint/Makefile
==============================================================================
--- head/graphics/xpaint/Makefile	Sat Jan 26 16:28:05 2013	(r311025)
+++ head/graphics/xpaint/Makefile	Sat Jan 26 16:30:12 2013	(r311026)
@@ -1,15 +1,10 @@
-# New ports collection makefile for:	xpaint
-# Date created:		2 Jan 1995
-# Whom:			swallace
-#
+# Created by: swallace
 # $FreeBSD$
-#
 
 PORTNAME=	xpaint
-PORTVERSION=	2.9.9
-PORTREVISION=	1
+PORTVERSION=	2.9.9.3
 CATEGORIES=	graphics
-MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	johans at FreeBSD.org
 COMMENT=	A simple paint program
@@ -17,13 +12,14 @@ COMMENT=	A simple paint program
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		openjpeg:${PORTSDIR}/graphics/openjpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		jbig.1:${PORTSDIR}/graphics/jbigkit \
-		Xaw3dxft.7:${PORTSDIR}/x11-toolkits/libxaw3dxft
+		tiff:${PORTSDIR}/graphics/tiff \
+		freetype:${PORTSDIR}/print/freetype2 \
+		jbig:${PORTSDIR}/graphics/jbigkit \
+		Xaw3dxft:${PORTSDIR}/x11-toolkits/libxaw3dxft
 
 USE_BZIP2=	yes
 USE_XORG=	xft xmu xpm
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
@@ -33,14 +29,17 @@ MAKE_ENV+=	RM="${RM} -f"
 MAN1=		xpaint.1 pdfconcat.1 imgmerge.1
 
 post-extract:
-	@${LN} -sf ${LOCALBASE}/include/X11/Xaw3dxft ${WRKSRC}/xaw_incdir
 	@${RM} -f ${WRKSRC}/XPaint.ad
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -Ee 's:/etc(/X11/app-defaults):${PREFIX}/lib\1:' \
+		-e '/xaw_incdir/s,/usr/include,${LOCALBASE}/include,' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
+		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
+		${WRKSRC}/rw/Makefile.in
 	@${REINPLACE_CMD} -e '/if (!image)/s/return;/return -1;/' \
 		${WRKSRC}/rw/readWriteTGA.c
 

Modified: head/graphics/xpaint/distinfo
==============================================================================
--- head/graphics/xpaint/distinfo	Sat Jan 26 16:28:05 2013	(r311025)
+++ head/graphics/xpaint/distinfo	Sat Jan 26 16:30:12 2013	(r311026)
@@ -1,2 +1,2 @@
-SHA256 (xpaint-2.9.9.tar.bz2) = 261a3fe356c2e32609cdb640e0ff8174117d82801290192ad191bdde57cc8696
-SIZE (xpaint-2.9.9.tar.bz2) = 1229047
+SHA256 (xpaint-2.9.9.3.tar.bz2) = 66e1d0a183290c0f399b1ca2f9770c6afd96e3002c64350a7f34b583157b953b
+SIZE (xpaint-2.9.9.3.tar.bz2) = 1279801