11 files changed, 302 insertions, 429 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 89c1d139aab5..9a4e2a0c3657 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,27 +6,39 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.1.21
+PORTVERSION=	0.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		freetype.7:${PORTSDIR}/print/freetype2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_XLIB=	yes
-USE_XPM=	yes
-USE_FREETYPE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+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
 INSTALLS_SHLIB=	yes
 
-pre-configure:
-	(cd ${WRKSRC}; ${LN} -sf xgd-1.7.3 xgd)
-	(cd ${WRKSRC}/libdib; ${LN} -sf ../bytelevel.c)
+pre-patch:
+	@${PERL} -pi -e 's|src include fonts doc|src include fonts|g' \
+		${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|\@LT_CURRENT\@|2|g ; \
+		 s|-release \$$\(LT_RELEASE\)||g' ${WRKSRC}/src/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
+		${TAR} -C ${DOCSDIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 4dce8da8aac2..2037b2c71025 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.1.21.tar.gz) = d9db1ec2a1264245e7808d42bc686b97
+MD5 (libwmf-0.2.1.tar.gz) = 79ef659f58758bf5053d0e27c7d4214b
diff --git a/graphics/libwmf/files/patch-aa b/graphics/libwmf/files/patch-aa
deleted file mode 100644
index ca6b56080ed9..000000000000
--- a/graphics/libwmf/files/patch-aa
+++ /dev/null
@@ -1,146 +0,0 @@
---- Makefile.in.orig	Tue Nov 14 19:32:08 2000
-+++ Makefile.in	Mon Dec 18 22:28:07 2000
-@@ -19,6 +19,7 @@
- SHELL=/bin/sh
- 
- INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
- INCLUDEDIR = @includedir@
-@@ -36,7 +37,7 @@
- 
- SHELL = /bin/sh
- 
--.SUFFIXES: .C .o
-+.SUFFIXES: .c .o .so
- 
- WMFLIBOBJECTS =	\
- 	wmfapi.o \
-@@ -58,42 +59,77 @@
- 	Xtext.o \
- 	rotated.o
- 
--TARGETS = wmftopng wmftofig wmftoeps xwmf
-+LIBRARIES = 	\
-+	LIBXGD \
-+	LIBDIB \
-+	LIBXFIG \
-+	libwmf.a \
-+	libgdwmf.a \
-+	libxfwmf.a \
-+	libXwmf.a \
-+	libepswmf.a \
-+	libwmf.so.1 \
-+	libgdwmf.so.1 \
-+	libxfwmf.so.1 \
-+	libXwmf.so.1 \
-+	libepswmf.so.1
-+
-+TARGETS = $(LIBRARIES) wmftopng wmftofig wmftoeps xwmf
- 
- all: $(TARGETS)
- 
--xwmf: libwmf.a libXwmf.a xwmf.o LIBDIB
-+xwmf: libwmf.so.1 libXwmf.so.1 xwmf.o LIBDIB
- 	$(CC) $(LDFLAGS) -o xwmf xwmf.o -L. -lXwmf -lwmf $(LIBS)
- 
--wmftopng:	libwmf.a libgdwmf.a wmftopng.o LIBXGD LIBDIB
-+wmftopng:	libwmf.so.1 libgdwmf.so.1 wmftopng.o LIBXGD LIBDIB
- 	$(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L. -lgdwmf -lwmf $(GDLIBS)
- 
--wmftofig: libwmf.a libxfwmf.a wmftofig.o LIBXFIG
-+wmftofig: libwmf.so.1 libxfwmf.so.1 wmftofig.o LIBXFIG
- 	$(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS)
- 
--wmftoeps: libwmf.a libepswmf.a wmftoeps.o LIBXFIG
-+wmftoeps: libwmf.so.1 libepswmf.so.1 wmftoeps.o LIBXFIG
- 	$(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L. -lepswmf -lwmf $(EPSLIBS)
- 
- libwmf.a:	$(WMFLIBOBJECTS)
- 	 $(AR) rc libwmf.a $(WMFLIBOBJECTS) 
- 	 $(RANLIB) libwmf.a 
- 
-+libwmf.so.1:	$(WMFLIBOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(WMFLIBOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libwmf.so.1 libwmf.so
-+
- libgdwmf.a:	$(GDLIBOBJECTS)
- 	 $(AR) rc libgdwmf.a $(GDLIBOBJECTS) 
- 	 $(RANLIB) libgdwmf.a
-+ 
-+libgdwmf.so.1: $(GDLIBOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(GDLIBOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libgdwmf.so.1 libgdwmf.so
- 
- libxfwmf.a:	$(XFLIBOBJECTS)
- 	 $(AR) rc libxfwmf.a $(XFLIBOBJECTS) 
- 	 $(RANLIB) libxfwmf.a
-+ 
-+libxfwmf.so.1: $(XFLIBOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(XFLIBOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libxfwmf.so.1 libxfwmf.so
- 
- libepswmf.a:	$(EPSLIBOBJECTS)
- 	 $(AR) rc libepswmf.a $(EPSLIBOBJECTS) 
- 	 $(RANLIB) libepswmf.a
- 
-+libepswmf.so.1:	$(EPSLIBOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(EPSLIBOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libepswmf.so.1 libepswmf.so
-+
- libXwmf.a:	$(XLIBOBJECTS)
- 	 $(AR) rc libXwmf.a $(XLIBOBJECTS) 
- 	 $(RANLIB) libXwmf.a
- 
-+libXwmf.so.1:  $(XLIBOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(XLIBOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libXwmf.so.1 libXwmf.so
-+
- LIBDIB:
- 	@echo making libdib in libdib
- 	@(cd libdib && $(MAKE)) || exit 1
-@@ -106,8 +142,8 @@
- 	@echo making libxfig, libeps in libxfig
- 	@(cd libxfig && $(MAKE)) || exit 1
- 
--%.o: %.c 
--	$(CC) $(CFLAGS) -c $*.c 
-+.c.so:
-+	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
- 
- clean: cleansub
- 	rm -rf *.o wmftopng wmftofig wmftoeps xwmf a.out core *.a .pure
-@@ -146,17 +182,28 @@
- 	$(libdir)
- 
- install: all installdirs installsub
--	$(INSTALL) $(srcdir)/xwmf $(bindir)/xwmf
--	$(INSTALL) $(srcdir)/wmftopng $(bindir)/wmftopng
--	$(INSTALL) $(srcdir)/wmftofig $(bindir)/wmftofig
--	$(INSTALL) $(srcdir)/wmftoeps $(bindir)/wmftoeps
-+	$(INSTALL_PROGRAM) $(srcdir)/xwmf $(bindir)/xwmf
-+	$(INSTALL_PROGRAM) $(srcdir)/wmftopng $(bindir)/wmftopng
-+	$(INSTALL_PROGRAM) $(srcdir)/wmftofig $(bindir)/wmftofig
-+	$(INSTALL_PROGRAM) $(srcdir)/wmftoeps $(bindir)/wmftoeps
- 	$(INSTALL_DATA) $(srcdir)/libwmf.a $(libdir)/libwmf.a
- 	$(INSTALL_DATA) $(srcdir)/libgdwmf.a $(libdir)/libgdwmf.a
- 	$(INSTALL_DATA) $(srcdir)/libXwmf.a $(libdir)/libXwmf.a
- 	$(INSTALL_DATA) $(srcdir)/libxfwmf.a $(libdir)/libxfwmf.a
- 	$(INSTALL_DATA) $(srcdir)/libepswmf.a $(libdir)/libepswmf.a
-+	$(INSTALL_DATA) $(srcdir)/libwmf.so.1 $(libdir)/libwmf.so.1
-+	ln -sf libwmf.so.1 $(libdir)/libwmf.so
-+	$(INSTALL_DATA) $(srcdir)/libgdwmf.so.1 $(libdir)/libgdwmf.so.1
-+	ln -sf libgdwmf.so.1 $(libdir)/libgdwmf.so
-+	$(INSTALL_DATA) $(srcdir)/libXwmf.so.1 $(libdir)/libXwmf.so.1
-+	ln -sf libXwmf.so.1 $(libdir)/libXwmf.so
-+	$(INSTALL_DATA) $(srcdir)/libxfwmf.so.1 $(libdir)/libxfwmf.so.1
-+	ln -sf libxfwmf.so.1 $(libdir)/libxfwmf.so
-+	$(INSTALL_DATA) $(srcdir)/libepswmf.so.1 $(libdir)/libepswmf.so.1
-+	ln -sf libepswmf.so.1 $(libdir)/libepswmf.so
- 	$(INSTALL_DATA) wmfapi.h $(INCLUDEDIR)/wmfapi.h
- 	$(INSTALL_DATA) gdwmfapi.h $(INCLUDEDIR)/gdwmfapi.h
- 	$(INSTALL_DATA) Xwmfapi.h $(INCLUDEDIR)/Xwmfapi.h
-+	$(INSTALL_DATA) xgdttf.h $(INCLUDEDIR)/xgdttf.h
- 
- #  DO  NOT  DELETE THIS LINE -- make depend depends on it.
diff --git a/graphics/libwmf/files/patch-ab b/graphics/libwmf/files/patch-ab
deleted file mode 100644
index a4f5f79dbb32..000000000000
--- a/graphics/libwmf/files/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
---- xgd-1.7.3/Makefile.in.orig	Tue Nov 14 19:32:11 2000
-+++ xgd-1.7.3/Makefile.in	Mon Dec 18 22:29:49 2000
-@@ -36,7 +36,7 @@
- 
- #If you don't have FreeType and/or Xpm fully installed, uncomment this
- #(default).
--LIBS= -lxgd @PNG_LIBS@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
-+LIBS=@LIBS@ -lxgd @PNG_LIBS@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
- 
- #If you do have FreeType and/or Xpm fully installed, uncomment a 
- #variation of this and comment out the line above. Note that
-@@ -59,7 +59,7 @@
- INSTALL_LIB=@libdir@
- 
- #Location where .h files should be installed by "make install".
--INSTALL_INCLUDE=@includedir@
-+INSTALL_INCLUDE=@includedir@/xgd
- 
- #Location where useful non-test programs should be installed by "make install".
- INSTALL_BIN=@bindir@
-@@ -80,18 +80,18 @@
- BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
- TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
- 
--all: libxgd.a $(PROGRAMS)
-+.SUFFIXES: .c .so .o
- 
--install: libxgd.a $(BIN_PROGRAMS)
--	$(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
-+.c.so:
-+	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
-+
-+all: libxgd.a libxgd.so.1
-+
-+install: libxgd.a libxgd.so.1
-+	$(INSTALL_DATA) libxgd.a $(INSTALL_LIB)/libxgd.a
-+	$(INSTALL_DATA) libxgd.so.1 $(INSTALL_LIB)/libxgd.so.1
-+	ln -sf libxgd.so.1 $(INSTALL_LIB)/libxgd.so
-+	mkdir -p $(INSTALL_INCLUDE)
- 	$(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
-@@ -134,16 +134,20 @@
- gdtestttf: gdtestttf.o libxgd.a
- 	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
- 
--libxgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
-+OBJS=	gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
- 	gd_io_ss.o gd_png.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
--	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \
--	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
-+	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o
-+INCS=	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
-+
-+libxgd.a: $(INCS) $(OBJS)
- 	rm -f libxgd.a
--	$(AR) rc libxgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
--		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gdxpm.o \
--		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
--		gdtables.o gdttf.o gdcache.o gdkanji.o
-+	$(AR) rc libxgd.a $(OBJS)
- 	-@RANLIB@ libxgd.a
-+
-+libxgd.so.1:	$(INCS) $(OBJS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS)
-+	ln -sf libxgd.so.1 libxgd.so
-+
- 
- clean:
- 	rm -f *.o *.a ${PROGRAMS} core 
diff --git a/graphics/libwmf/files/patch-ac b/graphics/libwmf/files/patch-ac
deleted file mode 100644
index 6eecd7840231..000000000000
--- a/graphics/libwmf/files/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
---- libxfig/Makefile.in.orig	Wed Sep 27 06:00:22 2000
-+++ libxfig/Makefile.in	Sat Nov  4 20:08:07 2000
-@@ -28,7 +28,7 @@
- 
- SHELL = /bin/sh
- 
--.SUFFIXES: .C .o
-+.SUFFIXES: .c .o .so
- 
- XFOBJECTS = \
- 	color.o \
-@@ -41,18 +41,26 @@
- 	epsfileops.o
- 
- 
--all: libxfig.a libeps.a
-+all: libxfig.a libxfig.so.1 libeps.a libeps.so.1
- 
- libxfig.a:  $(XFOBJECTS)
- 	$(AR) rc libxfig.a $(XFOBJECTS)
- 	$(RANLIB) libxfig.a 
- 
-+libxfig.so.1:  $(XFOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(XFOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libxfig.so.1 libxfig.so
-+
- libeps.a:  $(EPSOBJECTS)
- 	$(AR) rc libeps.a $(EPSOBJECTS)
- 	$(RANLIB) libeps.a 
- 
--%.o: %.c
--	$(CC) $(CFLAGS) -c $*.c
-+libeps.so.1:  $(EPSOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(EPSOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libeps.so.1 libeps.so
-+
-+.c.so:
-+	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
- 
- clean:
- 	rm -rf *.o *.a core
-@@ -62,7 +70,11 @@
- 
- install: all installdirs
- 	$(INSTALL_DATA) libxfig.a @libdir@/libxfig.a
-+	$(INSTALL_DATA) libxfig.so.1 @libdir@/libxfig.so.1
-+	ln -sf libxfig.so.1 @libdir@/libxfig.so
- 	$(INSTALL_DATA) libeps.a @libdir@/libeps.a
-+	$(INSTALL_DATA) libeps.so.1 @libdir@/libeps.so.1
-+	ln -sf libeps.so.1 @libdir@/libeps.so
- 
- installdirs:
- 	$(MKINSTALLDIRS) @libdir@ \
diff --git a/graphics/libwmf/files/patch-ad b/graphics/libwmf/files/patch-ad
deleted file mode 100644
index bb81e1a3c6f2..000000000000
--- a/graphics/libwmf/files/patch-ad
+++ /dev/null
@@ -1,52 +0,0 @@
---- libdib/Makefile.in.orig	Tue Nov 14 19:32:10 2000
-+++ libdib/Makefile.in	Mon Dec 18 22:33:23 2000
-@@ -22,30 +22,34 @@
- libdir = @libdir@
- mandir = @mandir@
- 
--CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I.
-+CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I. -I..
- 
- MKINSTALLDIRS = $(srcdir)/mkinstalldirs
- 
- SHELL = /bin/sh
- 
--.SUFFIXES: .C .o
-+.SUFFIXES: .c .o .so
- 
- MYOBJECTS = \
--    ../bytelevel.o \
-+    bytelevel.o \
-     bintree.o \
-     dibtoxpm.o
- 
--all: libdib.a test_dibtoxpm
-+all: libdib.a libdib.so.1 test_dibtoxpm
- 
- libdib.a:  $(MYOBJECTS)
- 	$(AR) rc libdib.a $(MYOBJECTS)
- 	$(RANLIB) libdib.a 
- 
-+libdib.so.1:	$(MYOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(MYOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libdib.so.1 libdib.so
-+
- test_dibtoxpm:  libdib.a test_dibtoxpm.o
- 	$(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -ldib
- 
--%.o: %.c
--	$(CC) $(CFLAGS) -c $*.c
-+.c.so:
-+	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
- 
- clean:
- 	rm -rf *.o *.a test_dibtoxpm a.out core
-@@ -60,6 +64,8 @@
- install: all installdirs
- 	$(INSTALL_DATA) dibtoxpm.h $(INCLUDEDIR)/dibtoxpm.h
- 	$(INSTALL_DATA) libdib.a @libdir@/libdib.a
-+	$(INSTALL_DATA) libdib.so.1 @libdir@/libdib.so.1
-+	ln -sf libdib.so.1 @libdir@/libdib.so
- 
- 
- #  DO  NOT  DELETE THIS LINE -- make depend depends on it.
diff --git a/graphics/libwmf/files/patch-ae b/graphics/libwmf/files/patch-ae
deleted file mode 100644
index 1e00e4b74422..000000000000
--- a/graphics/libwmf/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- xgd-1.7.3/gdcache.h.orig	Thu Oct 14 06:20:11 1999
-+++ xgd-1.7.3/gdcache.h	Tue May 30 19:59:48 2000
-@@ -40,7 +40,11 @@
- /* header                                                */
- /*********************************************************/
- 
-+#ifdef __STDC__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #ifndef NULL
- #define NULL (void *)0
- #endif
diff --git a/graphics/libwmf/files/patch-af b/graphics/libwmf/files/patch-af
deleted file mode 100644
index 7287aca569cb..000000000000
--- a/graphics/libwmf/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- Xwmfapi.h	Wed Aug 18 04:16:50 1999
-+++ Xwmfapi.h.new	Sun Jul  2 17:55:05 2000
-@@ -3,7 +3,7 @@
- #include <X11/Xlib.h>
- #include <X11/X.h>
- 
--#include "myxpm.h"
-+#include <X11/xpm.h>
- 
- 
- typedef struct _X_Struct
diff --git a/graphics/libwmf/files/patch-ag b/graphics/libwmf/files/patch-ag
deleted file mode 100644
index 9944353c95cb..000000000000
--- a/graphics/libwmf/files/patch-ag
+++ /dev/null
@@ -1,9 +0,0 @@
---- gdwmfapi.h	Thu Dec 16 08:18:48 1999
-+++ gdwmfapi.h.new	Sun Jul  2 17:53:04 2000
-@@ -1,5 +1,5 @@
- #include "wmfapi.h"
--#include "gd.h"
-+#include "xgd/gd.h"
- 
- typedef struct _GD_Struct
- {
diff --git a/graphics/libwmf/files/patch-gdwmfapi.c b/graphics/libwmf/files/patch-gdwmfapi.c
deleted file mode 100644
index d9f811b17095..000000000000
--- a/graphics/libwmf/files/patch-gdwmfapi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdwmfapi.c.orig	Sat Jul  7 21:30:22 2001
-+++ gdwmfapi.c	Sat Jul  7 21:30:32 2001
-@@ -2,7 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "gd.h"
-+#include "xgd/gd.h"
- #include "xgdttf.h"
- 
- #include "gdwmfapi.h"
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 5d27bb986eb2..7ab8f94414b9 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -1,45 +1,280 @@
-bin/wmftoeps
-bin/wmftofig
-bin/wmftopng
-bin/xwmf
-include/Xwmfapi.h
-include/dibtoxpm.h
-include/gdwmfapi.h
-include/wmfapi.h
-include/xgdttf.h
-include/xgd/gd.h
-include/xgd/gd_io.h
-include/xgd/gdcache.h
-include/xgd/gdfontg.h
-include/xgd/gdfontl.h
-include/xgd/gdfontmb.h
-include/xgd/gdfonts.h
-include/xgd/gdfontt.h
-lib/libXwmf.a
-lib/libXwmf.so
-lib/libXwmf.so.1
-lib/libdib.a
-lib/libdib.so
-lib/libdib.so.1
-lib/libeps.a
-lib/libeps.so
-lib/libeps.so.1
-lib/libepswmf.a
-lib/libepswmf.so
-lib/libepswmf.so.1
-lib/libgdwmf.a
-lib/libgdwmf.so
-lib/libgdwmf.so.1
+bin/libwmf-config
+bin/libwmf-fontmap
+bin/wmf2eps
+bin/wmf2fig
+bin/wmf2gd
+bin/wmf2magick
+bin/wmf2svg
+bin/wmf2x
+include/libwmf/api.h
+include/libwmf/color.h
+include/libwmf/defs.h
+include/libwmf/eps.h
+include/libwmf/fig.h
+include/libwmf/fund.h
+include/libwmf/gd/gd.h
+include/libwmf/gd/gd_clip.h
+include/libwmf/gd/gd_io.h
+include/libwmf/gd/gdcache.h
+include/libwmf/gd/gdfontg.h
+include/libwmf/gd/gdfontl.h
+include/libwmf/gd/gdfontmb.h
+include/libwmf/gd/gdfonts.h
+include/libwmf/gd/gdfontt.h
+include/libwmf/gd.h
+include/libwmf/ipa.h
+include/libwmf/macro.h
+include/libwmf/magick.h
+include/libwmf/plot.h
+include/libwmf/svg.h
+include/libwmf/types.h
+include/libwmf/x.h
 lib/libwmf.a
 lib/libwmf.so
-lib/libwmf.so.1
-lib/libxfig.a
-lib/libxfig.so
-lib/libxfig.so.1
-lib/libxfwmf.a
-lib/libxfwmf.so
-lib/libxfwmf.so.1
-lib/libxgd.a
-lib/libxgd.so
-lib/libxgd.so.1
-@dirrm include/xgd
+lib/libwmf.so.2
+%%PORTDOCS%%share/doc/libwmf/caolan/2.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Arc.html
+%%PORTDOCS%%share/doc/libwmf/caolan/BitBlt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Bmpfrmat.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Chord.html
+%%PORTDOCS%%share/doc/libwmf/caolan/CreateBrushIndirect.html
+%%PORTDOCS%%share/doc/libwmf/caolan/CreatePenIndirect.html
+%%PORTDOCS%%share/doc/libwmf/caolan/CreateRegion.html
+%%PORTDOCS%%share/doc/libwmf/caolan/DeleteObject.html
+%%PORTDOCS%%share/doc/libwmf/caolan/DibBitBlt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/DibCreatePatternBrush.html
+%%PORTDOCS%%share/doc/libwmf/caolan/DibStretchBlt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Ellipse.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ExcludeClipRect.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ExtFloodFill.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ExtTextOut.html
+%%PORTDOCS%%share/doc/libwmf/caolan/FillRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/FloodFill.html
+%%PORTDOCS%%share/doc/libwmf/caolan/FrameRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/IntersectClipRect.html
+%%PORTDOCS%%share/doc/libwmf/caolan/InvertRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/LineTo.html
+%%PORTDOCS%%share/doc/libwmf/caolan/MoveTo.html
+%%PORTDOCS%%share/doc/libwmf/caolan/OffsetClipRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/OffsetViewportOrg.html
+%%PORTDOCS%%share/doc/libwmf/caolan/OffsetWindowOrg.html
+%%PORTDOCS%%share/doc/libwmf/caolan/PaintRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/PatBlt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Pie.html
+%%PORTDOCS%%share/doc/libwmf/caolan/PolyPolygon.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Polygon.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Polyline.html
+%%PORTDOCS%%share/doc/libwmf/caolan/Rectangle.html
+%%PORTDOCS%%share/doc/libwmf/caolan/RestoreDC.html
+%%PORTDOCS%%share/doc/libwmf/caolan/RoundRect.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SaveDC.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ScaleViewportExt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ScaleWindowExt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SelectClipRgn.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SelectObject.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetBkColor.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetBkMode.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetDIBitsToDevice.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetMapMode.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetMapperFlags.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetPixel.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetPolyFillMode.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetROP2.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetStretchBltMode.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetTextAlign.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetTextCharacterExtra.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetTextColor.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetTextJustification.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetViewportExt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetViewportOrg.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetWindowExt.html
+%%PORTDOCS%%share/doc/libwmf/caolan/SetWindowOrg.html
+%%PORTDOCS%%share/doc/libwmf/caolan/StretchDib.html
+%%PORTDOCS%%share/doc/libwmf/caolan/TextOut.html
+%%PORTDOCS%%share/doc/libwmf/caolan/dibs.html
+%%PORTDOCS%%share/doc/libwmf/caolan/esc.html
+%%PORTDOCS%%share/doc/libwmf/caolan/index.html
+%%PORTDOCS%%share/doc/libwmf/caolan/mapmode.html
+%%PORTDOCS%%share/doc/libwmf/caolan/msmeta01.gif
+%%PORTDOCS%%share/doc/libwmf/caolan/msmeta02.gif
+%%PORTDOCS%%share/doc/libwmf/caolan/msmeta03.gif
+%%PORTDOCS%%share/doc/libwmf/caolan/msmeta04.gif
+%%PORTDOCS%%share/doc/libwmf/caolan/ora-clp.html
+%%PORTDOCS%%share/doc/libwmf/caolan/ora-wmf.html
+%%PORTDOCS%%share/doc/libwmf/caolan/pics/weave.jpg
+%%PORTDOCS%%share/doc/libwmf/caolan/rop.html
+%%PORTDOCS%%share/doc/libwmf/caolan/support.html
+%%PORTDOCS%%share/doc/libwmf/caolan/support2.html
+%%PORTDOCS%%share/doc/libwmf/caolan/template.html
+%%PORTDOCS%%share/doc/libwmf/caolan/unknown.html
+%%PORTDOCS%%share/doc/libwmf/dlayer.html
+%%PORTDOCS%%share/doc/libwmf/gd.html
+%%PORTDOCS%%share/doc/libwmf/html/annotated.html
+%%PORTDOCS%%share/doc/libwmf/html/api_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/api_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/bbuf_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/classes.html
+%%PORTDOCS%%share/doc/libwmf/html/clip_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/coord_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/dc_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/defaults_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/defs_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/doxygen.css
+%%PORTDOCS%%share/doc/libwmf/html/doxygen.gif
+%%PORTDOCS%%share/doc/libwmf/html/eps_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/eps_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/eps_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/eps_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/eps_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/fig_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/fig_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/fig_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/fig_2font_8h.html
+%%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/functions.html
+%%PORTDOCS%%share/doc/libwmf/html/fund_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/gd_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/gd_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/gd_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/gd_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/gd_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/globals.html
+%%PORTDOCS%%share/doc/libwmf/html/include_2libwmf_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/index.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2eps_2region_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2fig_2region_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2font_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2gd_2region_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_2magick_2region_8h.html
+%%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_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/ipa_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/macro_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/magick_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/magick_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/magick_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/magick_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/magick_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/meta_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/meta_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/player_2region_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/player_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/plot_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/plot_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/plot_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/plot_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/plot_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/record_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2fig_2color_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/src_2ipa_2ipa_2color_8h.html
+%%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__wmfAPI.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfAPI__Options.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP__Draw__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfBMP__Read__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfBrush.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfColorData.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDC.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfD__Coord.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfD__Rect.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDrawArc__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDrawLine__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDrawPixel__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDrawRectangle__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfDrawText__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFT__CacheEntry.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFT__Mapping.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFlood__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFont.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFontData.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFontMap.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfFunctionReference.html
+%%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__wmfMapping.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfMetaHeader.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfPen.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfPlaceableMetaHeader.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfPolyLine__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfPolyRectangle__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfRGB.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfROP__Draw__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfStream.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfUserData__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfXML__FontData.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmfXML__FontInfo.html
+%%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__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
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__magick__t_1_1__wmf__magick__image.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__plot__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__svg__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__svg__t_1_1__wmf__svg__image.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__template__t.html
+%%PORTDOCS%%share/doc/libwmf/html/struct__wmf__x__t.html
+%%PORTDOCS%%share/doc/libwmf/html/svg_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/svg_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/svg_2draw_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/svg_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/svg_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/template_8c.html
+%%PORTDOCS%%share/doc/libwmf/html/template_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/types_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/x_2bmp_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/x_2device_8h.html
+%%PORTDOCS%%share/doc/libwmf/html/x_2draw_8h.html
+%%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/index.html
+%%PORTDOCS%%share/doc/libwmf/smlogo2.gif
+%%PORTDOCS%%share/doc/libwmf/tutapi.html
+%%PORTDOCS%%share/doc/libwmf/tutipa.html
+%%PORTDOCS%%share/doc/libwmf/wmfpic.png
+share/libwmf/fonts/fontmap
+share/libwmf/fonts/n019003l.afm
+share/libwmf/fonts/n019003l.pfb
+share/libwmf/fonts/n019004l.afm
+share/libwmf/fonts/n019004l.pfb
+share/libwmf/fonts/n019023l.afm
+share/libwmf/fonts/n019023l.pfb
+share/libwmf/fonts/n019024l.afm
+share/libwmf/fonts/n019024l.pfb
+share/libwmf/fonts/n021003l.afm
+share/libwmf/fonts/n021003l.pfb
+share/libwmf/fonts/n021004l.afm
+share/libwmf/fonts/n021004l.pfb
+share/libwmf/fonts/n021023l.afm
+share/libwmf/fonts/n021023l.pfb
+share/libwmf/fonts/n021024l.afm
+share/libwmf/fonts/n021024l.pfb
+share/libwmf/fonts/n022003l.afm
+share/libwmf/fonts/n022003l.pfb
+share/libwmf/fonts/n022004l.afm
+share/libwmf/fonts/n022004l.pfb
+share/libwmf/fonts/n022023l.afm
+share/libwmf/fonts/n022023l.pfb
+share/libwmf/fonts/n022024l.afm
+share/libwmf/fonts/n022024l.pfb
+share/libwmf/fonts/s050000l.afm
+share/libwmf/fonts/s050000l.pfb
+@dirrm share/libwmf/fonts
+@dirrm share/libwmf
+%%PORTDOCS%%@dirrm share/doc/libwmf/html
+%%PORTDOCS%%@dirrm share/doc/libwmf/caolan/pics
+%%PORTDOCS%%@dirrm share/doc/libwmf/caolan
+%%PORTDOCS%%@dirrm share/doc/libwmf
+@dirrm include/libwmf/gd
+@dirrm include/libwmf