* updated to libwmf-0.1.21. From CHANGELOG:

v 0.1.21
    * F.J. Franklin patch cleaning up header files (add common.h, region.h).
    * F.J. Franklin patch improves TTF config.
	* Bob Bell syntax fixes.

5 files changed, 14 insertions, 25 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index f7f125f0422..3adfcd8013d 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/03/04 09:06:13 tron Exp $
+# $NetBSD: Makefile,v 1.19 2001/03/04 15:45:42 kei Exp $
 #
 
-DISTNAME=		libwmf-0.1.20
+DISTNAME=		libwmf-0.1.21
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
@@ -27,6 +27,9 @@ INCLUDEDIR=		${PREFIX}/include/libwmf
 HTMLDIR=		${PREFIX}/share/doc/html/libwmf
 WRKSRC=			${WRKDIR}/libwmf
 
+post-extract:
+	${CHMOD} a-x ${WRKSRC}/doc/*.html
+
 pre-install:
 	${INSTALL_DATA_DIR} ${INCLUDEDIR}
 
diff --git a/graphics/libwmf/files/md5 b/graphics/libwmf/files/md5
index c99267218b2..defc98c98e1 100644
--- a/graphics/libwmf/files/md5
+++ b/graphics/libwmf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/11/16 18:25:23 wiz Exp $
+$NetBSD: md5,v 1.3 2001/03/04 15:45:42 kei Exp $
 
-MD5 (libwmf-0.1.20.tar.gz) = 5f1b9cce9cce6ce60e061722a73eea79
+MD5 (libwmf-0.1.21.tar.gz) = d9db1ec2a1264245e7808d42bc686b97
diff --git a/graphics/libwmf/files/patch-sum b/graphics/libwmf/files/patch-sum
index 58e429526c5..6392ab841ea 100644
--- a/graphics/libwmf/files/patch-sum
+++ b/graphics/libwmf/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/11/16 18:25:23 wiz Exp $
+$NetBSD: patch-sum,v 1.7 2001/03/04 15:45:42 kei Exp $
 
-MD5 (patch-aa) = 89778142c2dcae71ab144617907cb6e1
-MD5 (patch-ac) = 63202e236b5c7b39e255f2857dc1ab87
+MD5 (patch-ac) = 81ba9bfb98281800f70cb7e0b2fb01bc
 MD5 (patch-ad) = b50ac6ef29eb5f4e156af73682901517
diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
deleted file mode 100644
index d58e86edde0..00000000000
--- a/graphics/libwmf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/11/16 18:25:23 wiz Exp $
-
---- Makefile.in.orig	Tue Oct 10 21:16:15 2000
-+++ Makefile.in
-@@ -30,7 +30,7 @@
- libdir = @libdir@
- mandir = @mandir@
- 
--CFLAGS = @CFLAGS@ @DEFS@ -I. @XPM_CFLAGS@ -I./libxfig -I./libdib -I./xgd-1.7.3 @TTF_CFLAGS@
-+CFLAGS = @CFLAGS@ @DEFS@ -I. -I./xgd-1.7.3 -I./libxfig -I./libdib @XPM_CFLAGS@ @TTF_CFLAGS@
- 
- MKINSTALLDIRS = $(srcdir)/mkinstalldirs
- 
diff --git a/graphics/libwmf/patches/patch-ac b/graphics/libwmf/patches/patch-ac
index 222e45a5b83..b2160d9b640 100644
--- a/graphics/libwmf/patches/patch-ac
+++ b/graphics/libwmf/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2000/11/16 18:25:24 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2001/03/04 15:45:43 kei Exp $
 
---- xgd-1.7.3/Makefile.in.orig	Tue Oct 10 21:16:16 2000
-+++ xgd-1.7.3/Makefile.in
+--- xgd-1.7.3/Makefile.in.orig	Tue Nov 14 19:32:11 2000
++++ xgd-1.7.3/Makefile.in	Sun Mar  4 15:50:03 2001
 @@ -29,7 +29,7 @@
  
  #If you don't have FreeType and/or Xpm installed, including the
  #header files, uncomment this (default).
--CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
-+CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ -I${LOCALBASE}/include
+-CFLAGS=@CPPFLAGS@ @CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
++CFLAGS=@CPPFLAGS@ @CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ -I${LOCALBASE}/include
  #If you do have FreeType and/or Xpm fully installed, uncomment a
  #variation of this and comment out the line above. See also LIBS below.
  #CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF