Update to version 0.2.6.

PR:		40623
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

3 files changed, 14 insertions, 10 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 870c0d4da6fe..6000e6a40784 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.2.5
-PORTREVISION=	1
+PORTVERSION=	0.2.6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -20,9 +19,10 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-magick --with-sys-gd=no \
+CONFIGURE_ARGS=	--with-sys-gd=no \
 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
 INSTALLS_SHLIB=	yes
@@ -37,10 +37,10 @@ PLIST_SUB+=	X11=''
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|src include fonts doc|src include fonts|g' \
+	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's|\@LT_CURRENT\@|2|g ; \
-		 s|-release \$$\(LT_RELEASE\)||g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|\@LT_CURRENT\@|2|g ; \
+		 s|-release [\$$][(]LT_RELEASE[)]||g' ${WRKSRC}/src/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index ee17d38f6202..e80b522e51b4 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.2.5.tar.gz) = 86b7f808a7809af991bfa90ec64c9dd2
+MD5 (libwmf-0.2.6.tar.gz) = 618dd6c361ee749449e3d19228b402b4
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index a3a3eb340e7a..94be470f378b 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -3,7 +3,6 @@ bin/libwmf-fontmap
 bin/wmf2eps
 bin/wmf2fig
 bin/wmf2gd
-bin/wmf2magick
 bin/wmf2svg
 %%X11%%bin/wmf2x
 include/libwmf/api.h
@@ -26,8 +25,6 @@ include/libwmf/gd/gdfontt.h
 include/libwmf/gd.h
 include/libwmf/ipa.h
 include/libwmf/macro.h
-include/libwmf/magick.h
-include/libwmf/plot.h
 include/libwmf/svg.h
 include/libwmf/types.h
 include/libwmf/x.h
@@ -126,6 +123,7 @@ lib/libwmflite.so.2
 %%PORTDOCS%%share/doc/libwmf/html/defs_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/doxygen.css
 %%PORTDOCS%%share/doc/libwmf/html/doxygen.gif
+%%PORTDOCS%%share/doc/libwmf/html/doxygen.png
 %%PORTDOCS%%share/doc/libwmf/html/eps_2bmp_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/eps_2device_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/eps_2draw_8h.html
@@ -185,6 +183,8 @@ lib/libwmflite.so.2
 %%PORTDOCS%%share/doc/libwmf/html/stream_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI__Options.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfAttributeStore.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfAttributes.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP__Draw__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP__Read__t.html
@@ -222,8 +222,10 @@ lib/libwmflite.so.2
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfROP__Draw__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfStream.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfUserData__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfWriteFileInfo.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfXML__FontData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfXML__FontInfo.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfXML__InputData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__eps__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__fig__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__fig__t_1_1__wmf__fig__image.html
@@ -255,6 +257,8 @@ lib/libwmflite.so.2
 %%PORTDOCS%%share/doc/libwmf/html/xgd_2device_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_2draw_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/xgd_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/xml_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/xml_8h.html
 %%PORTDOCS%%share/doc/libwmf/index.html
 %%PORTDOCS%%share/doc/libwmf/smlogo2.gif
 %%PORTDOCS%%share/doc/libwmf/tutapi.html