Update to libwmf-0.1.20. Changes since 0.1.17 are:

Lots of bug fixes for wmftofig, font support, a scale-bmp option, and
wmftoeps.
pkgchange: Remove a lot of libintl-cruft.

8 files changed, 27 insertions, 395 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index df789074371..7a991904cc0 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2000/09/10 20:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2000/11/16 18:25:23 wiz Exp $
 #
 
-DISTNAME=		libwmf-0.1.17
-PKGNAME=		libwmf-0.1.17nb1
+DISTNAME=		libwmf-0.1.20
 CATEGORIES=		graphics devel
-MASTER_SITES=		http://www.csn.ul.ie/~caolan/publink/libwmf/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.csn.ul.ie/~caolan/docs/libwmf.html
+HOMEPAGE=		http://www.wvware.com/libwmf.html
 
 DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
diff --git a/graphics/libwmf/files/md5 b/graphics/libwmf/files/md5
index faa789fb424..c99267218b2 100644
--- a/graphics/libwmf/files/md5
+++ b/graphics/libwmf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/02/27 18:33:39 wiz Exp $
+$NetBSD: md5,v 1.2 2000/11/16 18:25:23 wiz Exp $
 
-MD5 (libwmf-0.1.17.tar.gz) = 7ade0bda9c9ba343481a0f272d302c7d
+MD5 (libwmf-0.1.20.tar.gz) = 5f1b9cce9cce6ce60e061722a73eea79
diff --git a/graphics/libwmf/files/patch-sum b/graphics/libwmf/files/patch-sum
index 7fe7a09a4eb..58e429526c5 100644
--- a/graphics/libwmf/files/patch-sum
+++ b/graphics/libwmf/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/09/10 20:31:34 wiz Exp $
+$NetBSD: patch-sum,v 1.6 2000/11/16 18:25:23 wiz Exp $
 
-MD5 (patch-aa) = c6fb8ed89209a6fdaa3ebeccd052543e
-MD5 (patch-ab) = 7c5b53a1edc460740c401f797ebaa2b7
-MD5 (patch-ac) = 95326ec337fc75a8dd8725c729fd22ff
-MD5 (patch-ad) = 5e70d73daecc149ff43fb1f9fab47a06
+MD5 (patch-aa) = 89778142c2dcae71ab144617907cb6e1
+MD5 (patch-ac) = 63202e236b5c7b39e255f2857dc1ab87
+MD5 (patch-ad) = b50ac6ef29eb5f4e156af73682901517
diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
index 3f1fd62a74a..d58e86edde0 100644
--- a/graphics/libwmf/patches/patch-aa
+++ b/graphics/libwmf/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/08/05 02:36:38 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/11/16 18:25:23 wiz Exp $
 
---- Makefile.in.orig	Thu Dec 16 10:31:01 1999
-+++ Makefile.in	Fri Aug  4 20:21:16 2000
-@@ -1,6 +1,6 @@
- LIBS = -L./libdib -ldib @XPM_LIBS@ @LIBS@ -lm
- 
--GDLIBS = -L./libdib -ldib -Lxgd-1.7.3 -lxgd @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lpng -lm 
-+GDLIBS = -L./libdib -ldib -Lxgd-1.7.3 -lxgd @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lpng @ZLIB_LIBS@ -lm 
- 
- XFLIBS = -L./libxfig -lxfig -L./libdib -ldib @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
- 
-@@ -28,7 +28,7 @@
+--- Makefile.in.orig	Tue Oct 10 21:16:15 2000
++++ Makefile.in
+@@ -30,7 +30,7 @@
  libdir = @libdir@
  mandir = @mandir@
  
diff --git a/graphics/libwmf/patches/patch-ab b/graphics/libwmf/patches/patch-ab
deleted file mode 100644
index 9abdc2d47f4..00000000000
--- a/graphics/libwmf/patches/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/08/05 02:36:38 jlam Exp $
-
---- configure.in.orig	Thu Dec 16 10:22:33 1999
-+++ configure.in	Fri Aug  4 20:27:48 2000
-@@ -86,7 +86,7 @@
-  _SAVE_LDFLAGS=$LDFLAGS
- 
- if test "$TTF_DIR" != "" ; then
--CFLAGS="-I${TTF_DIR}/include $CFLAGS"
-+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
- LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
- fi
- 
-@@ -100,22 +100,21 @@
-     AC_MSG_RESULT("$result")
- fi
- if [ test "$SYSTEM_TTF" = 1 ]; then
--	AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],
--	AC_CHECK_LIB(ttf, TT_Done_FreeType, [TTF_LIBS="-lttf -lnsl"],
--	no_ttf=yes, -lnsl))
-+	AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+	no_ttf=yes, -lintl)
- else
-     no_ttf=yes
- fi
- 
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
--    TTF_CFLAGS="-I${TTF_DIR}/include"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- if test "x$no_ttf" = xyes; then
-     if test "$TTF_DIR" != "" ; then
--    CFLAGS="-I${TTF_DIR} $CFLAGS"
--    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
-+    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
-+    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
-     fi
- 
-     if test "$TTF_DIR" = no; then
-@@ -128,16 +127,15 @@
-         AC_MSG_RESULT("$result")
-     fi
-     if [ test "$SYSTEM_TTF" = 1 ]; then
--		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],
--		AC_CHECK_LIB(ttf, TT_Done_FreeType, [TTF_LIBS="-lttf -lnsl"],
--		no_ttf=yes, -lnsl))
-+		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+		no_ttf=yes, -lintl)
-     else
-         no_ttf=yes
-     fi
- 
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
--    TTF_CFLAGS="-I${TTF_DIR}"
--    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- fi
-@@ -404,20 +402,21 @@
-     AC_MSG_RESULT("$result")
- fi
- if [ test "$SYSTEM_TTF" = 1 ]; then
--    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
-+    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+    no_ttf=yes,-lintl)
- else
-     no_ttf=yes
- fi
- 
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
--    TTF_CFLAGS="-I${TTF_DIR}/include"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- if test "x$no_ttf" = xyes; then
-     if test "$TTF_DIR" != "" ; then
--    CFLAGS="-I${TTF_DIR} $CFLAGS"
--    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
-+    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
-+    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
-     fi
- 
-     if test "$TTF_DIR" = no; then
-@@ -430,15 +429,16 @@
-         AC_MSG_RESULT("$result")
-     fi
-     if [ test "$SYSTEM_TTF" = 1 ]; then
--        AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
-+        AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
-+	no_ttf=yes,-lintl)
-     else
-         no_ttf=yes
-     fi
- 
- 
- if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
--    TTF_CFLAGS="-I${TTF_DIR}"
--    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- fi
diff --git a/graphics/libwmf/patches/patch-ac b/graphics/libwmf/patches/patch-ac
index 5e5277db24f..222e45a5b83 100644
--- a/graphics/libwmf/patches/patch-ac
+++ b/graphics/libwmf/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/08/06 14:18:50 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2000/11/16 18:25:24 wiz Exp $
 
---- xgd-1.7.3/Makefile.in.orig	Thu Dec 16 16:31:47 1999
-+++ xgd-1.7.3/Makefile.in	Sun Aug  6 15:23:04 2000
+--- xgd-1.7.3/Makefile.in.orig	Tue Oct 10 21:16:16 2000
++++ xgd-1.7.3/Makefile.in
 @@ -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../ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
-+CFLAGS=@CFLAGS@ @DEFS@ -I../ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ -I${LOCALBASE}/include
+-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
  #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
diff --git a/graphics/libwmf/patches/patch-ad b/graphics/libwmf/patches/patch-ad
index ed5fc3df411..56a2d161c6a 100644
--- a/graphics/libwmf/patches/patch-ad
+++ b/graphics/libwmf/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/09/10 20:31:34 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2000/11/16 18:25:24 wiz Exp $
 
---- configure.orig	Thu Dec 16 16:22:34 1999
+--- configure.orig	Thu Oct 19 16:10:42 2000
 +++ configure
-@@ -1216,7 +1216,7 @@
+@@ -1520,7 +1520,7 @@
  
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
@@ -11,257 +11,3 @@ $NetBSD: patch-ad,v 1.1 2000/09/10 20:31:34 wiz Exp $
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
      case "`(uname -sr) 2>/dev/null`" in
-@@ -1822,7 +1822,7 @@
-  _SAVE_LDFLAGS=$LDFLAGS
- 
- if test "$TTF_DIR" != "" ; then
--CFLAGS="-I${TTF_DIR}/include $CFLAGS"
-+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
- LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
- fi
- 
-@@ -1857,7 +1857,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf  $LIBS"
-+LIBS="-lttf -lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1863 "configure"
- #include "confdefs.h"
-@@ -1885,65 +1885,25 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
--echo "configure:1893: checking for TT_Done_FreeType in -lttf" >&5
--ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lttf -lnsl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1901 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char TT_Done_FreeType();
--
--int main() {
--TT_Done_FreeType()
--; return 0; }
--EOF
--if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf -lnsl"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
- fi
- 
--fi
--
- else
-     no_ttf=yes
- fi
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}/include"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- if test "x$no_ttf" = xyes; then
-     if test "$TTF_DIR" != "" ; then
--    CFLAGS="-I${TTF_DIR} $CFLAGS"
--    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
-+    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
-+    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
-     fi
- 
-     if test "$TTF_DIR" = no; then
-@@ -1973,7 +1933,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf  $LIBS"
-+LIBS="-lttf -lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1985 "configure"
- #include "confdefs.h"
-@@ -2007,59 +1967,19 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
--echo "configure:2015: checking for TT_Done_FreeType in -lttf" >&5
--ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lttf -lnsl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2023 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char TT_Done_FreeType();
--
--int main() {
--TT_Done_FreeType()
--; return 0; }
--EOF
--if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf -lnsl"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
- fi
- 
--fi
--
-     else
-         no_ttf=yes
-     fi
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}"
--    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- fi
-@@ -2361,7 +2281,7 @@
- 
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
-@@ -3777,15 +3697,15 @@
- fi
- if  test "$SYSTEM_TTF" = 1 ; then
-     echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
--echo "configure:3781: checking for TT_Init_FreeType in -lttf" >&5
-+echo "configure:3701: checking for TT_Init_FreeType in -lttf" >&5
- ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf -lm $LIBS"
-+LIBS="-lttf -lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3789 "configure"
-+#line 3709 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3811,7 +3731,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
-@@ -3822,14 +3742,14 @@
- fi
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}/include"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- if test "x$no_ttf" = xyes; then
-     if test "$TTF_DIR" != "" ; then
--    CFLAGS="-I${TTF_DIR} $CFLAGS"
--    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
-+    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
-+    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
-     fi
- 
-     if test "$TTF_DIR" = no; then
-@@ -3859,15 +3779,15 @@
-     fi
-     if  test "$SYSTEM_TTF" = 1 ; then
-         echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
--echo "configure:3863: checking for TT_Init_FreeType in -lttf" >&5
-+echo "configure:3783: checking for TT_Init_FreeType in -lttf" >&5
- ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lttf -lm $LIBS"
-+LIBS="-lttf -lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3871 "configure"
-+#line 3791 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3893,7 +3813,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TTF_LIBS="-lttf"
-+  TTF_LIBS="-lttf -lintl"
- else
-   echo "$ac_t""no" 1>&6
- no_ttf=yes
-@@ -3905,8 +3825,8 @@
- 
- 
- if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
--    TTF_CFLAGS="-I${TTF_DIR}"
--    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
-+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
-+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
- fi
- 
- fi
diff --git a/graphics/libwmf/pkg/PLIST b/graphics/libwmf/pkg/PLIST
index 27dcfd47050..109b1f5ff2f 100644
--- a/graphics/libwmf/pkg/PLIST
+++ b/graphics/libwmf/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/05 02:36:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/11/16 18:25:24 wiz Exp $
+bin/wmftoeps
 bin/wmftofig
 bin/wmftopng
 bin/xwmf
@@ -17,6 +18,8 @@ include/libwmf/myxpm.h
 include/libwmf/wmfapi.h
 lib/libXwmf.a
 lib/libdib.a
+lib/libeps.a
+lib/libepswmf.a
 lib/libgdwmf.a
 lib/libwmf.a
 lib/libxfig.a
@@ -82,6 +85,7 @@ share/doc/html/libwmf/SetViewportExt.html
 share/doc/html/libwmf/SetViewportOrg.html
 share/doc/html/libwmf/SetWindowExt.html
 share/doc/html/libwmf/SetWindowOrg.html
+share/doc/html/libwmf/StretchDib.html
 share/doc/html/libwmf/TextOut.html
 share/doc/html/libwmf/dibs.html
 share/doc/html/libwmf/esc.html