4 files changed, 46 insertions, 7 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 9a4e2a0c3657..e7100e48d933 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.2.1
+PORTVERSION=	0.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -20,11 +20,12 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_XLIB=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-			  -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# none
+CONFIGURE_ARGS=	--build=${ARCH}-portbld-freebsd${OSREL} \
+		--enable-magick --with-sys-gd=no \
+		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
+		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 2037b2c71025..442792e3c58e 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.2.1.tar.gz) = 79ef659f58758bf5053d0e27c7d4214b
+MD5 (libwmf-0.2.2.tar.gz) = 49fc8a235b09cdb62f0cf03ec514669f
diff --git a/graphics/libwmf/files/patch-ltmain.sh b/graphics/libwmf/files/patch-ltmain.sh
new file mode 100644
index 000000000000..6f0d975557a7
--- /dev/null
+++ b/graphics/libwmf/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Sun Oct 28 22:08:24 2001
++++ ltmain.sh	Sat Nov 17 05:11:40 2001
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 7ab8f94414b9..d3eed90124fd 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -11,6 +11,7 @@ include/libwmf/color.h
 include/libwmf/defs.h
 include/libwmf/eps.h
 include/libwmf/fig.h
+include/libwmf/foreign.h
 include/libwmf/fund.h
 include/libwmf/gd/gd.h
 include/libwmf/gd/gd_clip.h
@@ -133,6 +134,8 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/fig_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/fig_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/files.html
+%%PORTDOCS%%share/doc/libwmf/html/foreign_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/foreign_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/functions.html
 %%PORTDOCS%%share/doc/libwmf/html/fund_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/gd_2bmp_8h.html
@@ -152,6 +155,7 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2plot_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2svg_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_2x_2region_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2xgd_2region_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/ipa_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/macro_8h.html
@@ -175,6 +179,7 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2x_2color_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/src_2player_2color_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/stream_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__gd__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI__Options.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP.html
@@ -200,6 +205,7 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfGS__FontData.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfGS__FontInfo.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfHead.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfImage.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfMapping.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfMetaHeader.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmfPen.html
@@ -215,6 +221,7 @@ lib/libwmf.so.2
 %%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
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__foreign__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__gd__t.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__gd__t_1_1__wmf__gd__sink.html
 %%PORTDOCS%%share/doc/libwmf/html/struct__wmf__magick__t.html
@@ -238,6 +245,12 @@ lib/libwmf.so.2
 %%PORTDOCS%%share/doc/libwmf/html/x_2font_8h.html
 %%PORTDOCS%%share/doc/libwmf/html/x_8c.html
 %%PORTDOCS%%share/doc/libwmf/html/x_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_2font_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/xgd_8h.html
 %%PORTDOCS%%share/doc/libwmf/index.html
 %%PORTDOCS%%share/doc/libwmf/smlogo2.gif
 %%PORTDOCS%%share/doc/libwmf/tutapi.html