Change build and installation so we don't conflict with graphics/gd.

Also install html documentation into PREFIX/share/doc/html.
Bump version to 0.1.17nb1

3 files changed, 117 insertions, 10 deletions

diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
index 44a46ae7426..3f1fd62a74a 100644
--- a/graphics/libwmf/patches/patch-aa
+++ b/graphics/libwmf/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/02/29 06:43:01 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2000/08/05 02:36:38 jlam Exp $
 
 --- Makefile.in.orig	Thu Dec 16 10:31:01 1999
-+++ Makefile.in	Tue Feb 29 01:30:08 2000
++++ Makefile.in	Fri Aug  4 20:21:16 2000
 @@ -1,6 +1,6 @@
  LIBS = -L./libdib -ldib @XPM_LIBS@ @LIBS@ -lm
  
@@ -10,3 +10,12 @@ $NetBSD: patch-aa,v 1.2 2000/02/29 06:43:01 jlam Exp $
  
  XFLIBS = -L./libxfig -lxfig -L./libdib -ldib @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
  
+@@ -28,7 +28,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-ab b/graphics/libwmf/patches/patch-ab
index 5940a340f78..9abdc2d47f4 100644
--- a/graphics/libwmf/patches/patch-ab
+++ b/graphics/libwmf/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2000/02/29 06:43:01 jlam Exp $
+$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	Tue Feb 29 01:24:31 2000
-@@ -100,9 +100,8 @@
++++ 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
@@ -14,7 +23,23 @@ $NetBSD: patch-ab,v 1.1 2000/02/29 06:43:01 jlam Exp $
  else
      no_ttf=yes
  fi
-@@ -128,9 +127,8 @@
+ 
+ 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
@@ -26,21 +51,58 @@ $NetBSD: patch-ab,v 1.1 2000/02/29 06:43:01 jlam Exp $
      else
          no_ttf=yes
      fi
-@@ -404,7 +402,7 @@
+ 
+ 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)
++    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
++    no_ttf=yes,-lintl)
  else
      no_ttf=yes
  fi
-@@ -430,7 +428,7 @@
+ 
+ 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)
++        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
new file mode 100644
index 00000000000..41c3a3cbd2f
--- /dev/null
+++ b/graphics/libwmf/patches/patch-ac
@@ -0,0 +1,36 @@
+$NetBSD: patch-ac,v 1.1 2000/08/05 02:36:38 jlam Exp $
+
+--- xgd-1.7.3/Makefile.in.orig	Thu Dec 16 10:31:47 1999
++++ xgd-1.7.3/Makefile.in	Fri Aug  4 20:18:39 2000
+@@ -45,7 +45,9 @@
+ 
+ #Typical install locations for freetype, zlib, xpm and libpng header files.
+ #If yours are somewhere else, change this. 
+-INCLUDEDIRS=
++#Put -I. first so that old versions of the gd library elsewhere
++#on your system can't cause conflicts while building a new one.
++INCLUDEDIRS=-I.
+ 
+ #Typical install locations for freetype, zlib, xpm and libpng libraries.
+ #If yours are somewhere else, other than a standard location
+@@ -80,18 +82,10 @@
+ BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
+ TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+ 
+-all: libxgd.a $(PROGRAMS)
++all: libxgd.a
+ 
+-install: libxgd.a $(BIN_PROGRAMS)
++install: libxgd.a
+ 	$(INSTALL) libxgd.a $(INSTALL_LIB)/libxgd.a
+-	$(INSTALL) pngtogd $(INSTALL_BIN)/pngtogd
+-	$(INSTALL) pngtogd2 $(INSTALL_BIN)/pngtogd2
+-	$(INSTALL) gdtopng $(INSTALL_BIN)/gdtopng
+-	$(INSTALL) gd2topng $(INSTALL_BIN)/gd2topng
+-	$(INSTALL) gd2copypal $(INSTALL_BIN)/gd2copypal
+-	$(INSTALL) gdparttopng $(INSTALL_BIN)/gdparttopng
+-	$(INSTALL) webpng $(INSTALL_BIN)/webpng
+-	$(INSTALL) bdftogd $(INSTALL_BIN)/bdftogd
+ 	$(INSTALL_DATA) gd.h $(INSTALL_INCLUDE)/gd.h
+ 	$(INSTALL_DATA) gdcache.h $(INSTALL_INCLUDE)/gdcache.h
+ 	$(INSTALL_DATA) gd_io.h $(INSTALL_INCLUDE)/gd_io.h