7 files changed, 105 insertions, 9 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index d91efd9d92d8..1a2b3ec46bfb 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.1.16
+PORTVERSION=	0.1.17
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/libwmf/
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
+		png.3:${PORTSDIR}/graphics/png \
 		ttf.4:${PORTSDIR}/print/freetype
 
-WRKSRC=		${WRKDIR}/libwmf
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ttf=${LOCALBASE}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype \
+		          -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}"/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index e7854b928c79..58991d4e9d87 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.1.16.tar.gz) = fa2e47b1101eadcb5a2d1e123c143df3
+MD5 (libwmf-0.1.17.tar.gz) = 7ade0bda9c9ba343481a0f272d302c7d
diff --git a/graphics/libwmf/files/patch-aa b/graphics/libwmf/files/patch-aa
new file mode 100644
index 000000000000..52fd8db9d0d0
--- /dev/null
+++ b/graphics/libwmf/files/patch-aa
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	Fri Dec 17 00:31:01 1999
++++ Makefile.in	Sat May 20 15:02:47 2000
+@@ -16,7 +16,7 @@
+ 
+ SHELL=/bin/sh
+ 
+-INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ INCLUDEDIR = @includedir@
+@@ -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. @XPM_CFLAGS@ -I./libxfig -I./libdib -I./xgd-1.7.3 @TTF_CFLAGS@ @CPPFLAGS@
+ 
+ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
+ 
+@@ -134,9 +134,9 @@
+ 	$(libdir)
+ 
+ install: all installdirs installsub
+-	$(INSTALL) $(srcdir)/xwmf $(bindir)/xwmf
+-	$(INSTALL) $(srcdir)/wmftopng $(bindir)/wmftopng
+-	$(INSTALL) $(srcdir)/wmftofig $(bindir)/wmftofig
++	$(INSTALL_PROGRAM) $(srcdir)/xwmf $(bindir)/xwmf
++	$(INSTALL_PROGRAM) $(srcdir)/wmftopng $(bindir)/wmftopng
++	$(INSTALL_PROGRAM) $(srcdir)/wmftofig $(bindir)/wmftofig
+ 	$(INSTALL_DATA) $(srcdir)/libwmf.a $(libdir)/libwmf.a
+ 	$(INSTALL_DATA) $(srcdir)/libgdwmf.a $(libdir)/libgdwmf.a
+ 	$(INSTALL_DATA) $(srcdir)/libXwmf.a $(libdir)/libXwmf.a
+@@ -144,5 +144,6 @@
+ 	$(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
new file mode 100644
index 000000000000..cdf75bd1ebbd
--- /dev/null
+++ b/graphics/libwmf/files/patch-ab
@@ -0,0 +1,50 @@
+--- xgd-1.7.3/Makefile.in.orig	Fri Dec 17 00:31:47 1999
++++ xgd-1.7.3/Makefile.in	Sat May 20 15:04:39 2000
+@@ -29,14 +29,14 @@
+ 
+ #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@ @CPPFLAGS@
+ #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
+ 
+ #If you don't have FreeType and/or Xpm fully installed, uncomment this
+ #(default).
+-LIBS= -lxgd @LIB_PNG@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
++LIBS= -lxgd @LIB_PNG@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ @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
+@@ -80,26 +80,11 @@
+ 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_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
+-	$(INSTALL_DATA) gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
+-	$(INSTALL_DATA) gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
+-	$(INSTALL_DATA) gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
+-	$(INSTALL_DATA) gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
+-	$(INSTALL_DATA) gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
++install: libxgd.a
++	$(INSTALL_DATA) libxgd.a $(INSTALL_LIB)/libxgd.a
++	$(INSTALL_DATA) gd.h $(INSTALL_INCLUDE)/xgd.h
+ 
+ gddemo: gddemo.o libxgd.a
+ 	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
diff --git a/graphics/libwmf/pkg-comment b/graphics/libwmf/pkg-comment
index 2fbfc5351414..8c26d28f1bd3 100644
--- a/graphics/libwmf/pkg-comment
+++ b/graphics/libwmf/pkg-comment
@@ -1 +1 @@
-A library of image format handlers
+Tools and library routines for converting microsoft's wmf (windows metafile)
diff --git a/graphics/libwmf/pkg-descr b/graphics/libwmf/pkg-descr
index 0d903baf8824..553e3687aecf 100644
--- a/graphics/libwmf/pkg-descr
+++ b/graphics/libwmf/pkg-descr
@@ -1,4 +1,6 @@
-This is an image format handler. It handles the following image
-formats:
+libwmf is a library for unix like machines that can convert wmf
+files into other formats, currently it supports a gd binding
+to convert to png, and an X one to draw direct to an X window
+or pixmap.
 
-bmp, gif, png, jpeg, tiff, xpm, xbm, and postscript.
+WWW: http://www.csn.ul.ie/~caolan/docs/libwmf.html
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 9db77862feb4..b596eeb2ef0c 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -1,5 +1,5 @@
 bin/wmftofig
-bin/wmftogif
+bin/wmftopng
 bin/xwmf
 include/Xwmfapi.h
 include/dibtoxpm.h