Update to 0.2.7. Changes:

* update Fontmap[.GS] detection (guesswork, really) (fjf)
* don't include trio.h when --disable-heavy is used (fjf)
* remember to update both version numbers in configure.ac!
* move player.h's defs into metadefs.h for recorder.c (fjf)
* add some missing "extern"s (c. Jeremy Shane Sanders)
* added recorder.h & libwmf/canvas.h; call it Canvas now (fjf)

4 files changed, 22 insertions, 12 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index a25031eb5c2..c9b69362d45 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2002/09/11 11:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2002/11/15 17:50:24 wiz Exp $
 #
 
-DISTNAME=		libwmf-0.2.6
+DISTNAME=		libwmf-0.2.7
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST
index 2b079bdc5d6..fcbaa2d7d80 100644
--- a/graphics/libwmf/PLIST
+++ b/graphics/libwmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/11 11:19:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/15 17:50:24 wiz Exp $
 bin/libwmf-config
 bin/libwmf-fontmap
 bin/wmf2eps
@@ -7,6 +7,7 @@ bin/wmf2gd
 bin/wmf2svg
 bin/wmf2x
 include/libwmf/libwmf/api.h
+include/libwmf/libwmf/canvas.h
 include/libwmf/libwmf/color.h
 include/libwmf/libwmf/defs.h
 include/libwmf/libwmf/eps.h
@@ -30,14 +31,14 @@ include/libwmf/libwmf/svg.h
 include/libwmf/libwmf/types.h
 include/libwmf/libwmf/x.h
 lib/libwmf-0.2.so
-lib/libwmf-0.2.so.6
-lib/libwmf-0.2.so.6.0
+lib/libwmf-0.2.so.7
+lib/libwmf-0.2.so.7.0
 lib/libwmf.a
 lib/libwmf.la
 lib/libwmf.so
 lib/libwmflite-0.2.so
-lib/libwmflite-0.2.so.6
-lib/libwmflite-0.2.so.6.0
+lib/libwmflite-0.2.so.7
+lib/libwmflite-0.2.so.7.0
 lib/libwmflite.a
 lib/libwmflite.la
 lib/libwmflite.so
@@ -122,6 +123,7 @@ share/doc/html/libwmf/html/annotated.html
 share/doc/html/libwmf/html/api_8c.html
 share/doc/html/libwmf/html/api_8h.html
 share/doc/html/libwmf/html/bbuf_8c.html
+share/doc/html/libwmf/html/canvas_8h.html
 share/doc/html/libwmf/html/classes.html
 share/doc/html/libwmf/html/clip_8h.html
 share/doc/html/libwmf/html/coord_8h.html
@@ -170,6 +172,7 @@ share/doc/html/libwmf/html/magick_8c.html
 share/doc/html/libwmf/html/magick_8h.html
 share/doc/html/libwmf/html/meta_8c.html
 share/doc/html/libwmf/html/meta_8h.html
+share/doc/html/libwmf/html/metadefs_8h.html
 share/doc/html/libwmf/html/player_2region_8h.html
 share/doc/html/libwmf/html/player_8c.html
 share/doc/html/libwmf/html/plot_2bmp_8h.html
@@ -178,6 +181,8 @@ share/doc/html/libwmf/html/plot_2draw_8h.html
 share/doc/html/libwmf/html/plot_8c.html
 share/doc/html/libwmf/html/plot_8h.html
 share/doc/html/libwmf/html/record_8h.html
+share/doc/html/libwmf/html/recorder_8c.html
+share/doc/html/libwmf/html/recorder_8h.html
 share/doc/html/libwmf/html/src_2font_8h.html
 share/doc/html/libwmf/html/src_2ipa_2fig_2color_8h.html
 share/doc/html/libwmf/html/src_2ipa_2fig_2font_8h.html
@@ -196,7 +201,11 @@ share/doc/html/libwmf/html/struct__wmfBMP.html
 share/doc/html/libwmf/html/struct__wmfBMP__Draw__t.html
 share/doc/html/libwmf/html/struct__wmfBMP__Read__t.html
 share/doc/html/libwmf/html/struct__wmfBrush.html
+share/doc/html/libwmf/html/struct__wmfCanvasBrush.html
+share/doc/html/libwmf/html/struct__wmfCanvasFont.html
+share/doc/html/libwmf/html/struct__wmfCanvasPen.html
 share/doc/html/libwmf/html/struct__wmfColorData.html
+share/doc/html/libwmf/html/struct__wmfConstruct.html
 share/doc/html/libwmf/html/struct__wmfDC.html
 share/doc/html/libwmf/html/struct__wmfD__Coord.html
 share/doc/html/libwmf/html/struct__wmfD__Rect.html
@@ -227,6 +236,7 @@ share/doc/html/libwmf/html/struct__wmfPolyPoly__t.html
 share/doc/html/libwmf/html/struct__wmfPolyRectangle__t.html
 share/doc/html/libwmf/html/struct__wmfRGB.html
 share/doc/html/libwmf/html/struct__wmfROP__Draw__t.html
+share/doc/html/libwmf/html/struct__wmfRecordBox.html
 share/doc/html/libwmf/html/struct__wmfStream.html
 share/doc/html/libwmf/html/struct__wmfUserData__t.html
 share/doc/html/libwmf/html/struct__wmfWriteFileInfo.html
diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk
index 40847f85ce0..34ef9aae407 100644
--- a/graphics/libwmf/buildlink2.mk
+++ b/graphics/libwmf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 11:19:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/11/15 17:50:24 wiz Exp $
 
 .if !defined(LIBWMF_BUILDLINK2_MK)
 LIBWMF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libwmf
-BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.6
+BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.7
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwmf=libwmf
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 15bd645cc60..a6b35c5c71b 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/09/11 11:19:56 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/11/15 17:50:24 wiz Exp $
 
-SHA1 (libwmf-0.2.6.tar.gz) = 4a9957de35e479df626e91a95d2057f460df0de9
-Size (libwmf-0.2.6.tar.gz) = 1585645 bytes
+SHA1 (libwmf-0.2.7.tar.gz) = a9ad4ef96e6d2194c43623b69215667933540ecc
+Size (libwmf-0.2.7.tar.gz) = 1610697 bytes
 SHA1 (patch-ad) = 896663daf56535f112ac03e03cef59ac09c870e5