5 files changed, 32 insertions, 82 deletions

diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 3a0d38b9be25..ac372a9a75ed 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wv
-PORTVERSION=	0.7.5
+PORTVERSION=	0.7.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -14,19 +14,27 @@ MASTER_SITE_SUBDIR=	wvware
 MAINTAINER=	mzaki@e-mail.ne.jp
 COMMENT=	A library and executables which allow access to Microsoft Word files
 
-LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf
 RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
+USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-libwmf=${LOCALBASE} --with-libiconv=${LOCALBASE} \
-		--with-png=${LOCALBASE} --with-exporter --without-glib
+CONFIGURE_ARGS=	--with-exporter --without-glib
+MAKEFILE=	GNUmakefile
+INSTALLS_SHLIB=	yes
 
 MAN1=	wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \
 	wvPS.1 wvRTF.1 wvSummary.1 wvText.1 wvVersion.1 wvWare.1 wvWml.1
 MLINKS=	wvWare.1 wvConvert.1
 
+CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e '/HAVE_MALLOC_H/d' ${WRKSRC}/config.h.in
+
 .include <bsd.port.mk>
diff --git a/textproc/wv/distinfo b/textproc/wv/distinfo
index 32d327c228e5..21957f65d938 100644
--- a/textproc/wv/distinfo
+++ b/textproc/wv/distinfo
@@ -1 +1 @@
-MD5 (wv-0.7.5.tar.gz) = 5c52991ce95b2ee02fbaebff0dc36869
+MD5 (wv-0.7.6.tar.gz) = 28c46d6676e0fce6a19e3cb730b04556
diff --git a/textproc/wv/files/patch-Makefile.in b/textproc/wv/files/patch-Makefile.in
deleted file mode 100644
index b404550ec6ce..000000000000
--- a/textproc/wv/files/patch-Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.in.orig	Wed Nov  6 03:01:41 2002
-+++ Makefile.in	Wed Nov 20 17:44:12 2002
-@@ -64,6 +64,8 @@
- RM = rm
- 
- INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- @SET_MAKE@
-@@ -85,7 +87,7 @@
- 
- DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\" -DWVDATADIR=\"$(datadir)/wv\"
- 
--CPPFLAGS = @CPPFLAGS@ @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
-+CPPFLAGS = @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @ICONV_CFLAGS@ @CPPFLAGS@
- 
- ifeq ($(EPATH_DYLIB),1)
- WVPICFLAGS = -fno-common -DPIC
-@@ -453,30 +455,24 @@
- 	$(includedir)	
- 
- install: installdirs all
--	chmod +x $(srcdir)/wvHtml
--	chmod +x $(srcdir)/wvLatex
--	chmod +x $(srcdir)/wvText
--	chmod +x $(srcdir)/wvWml
--	chmod +x $(srcdir)/wvCleanLatex
--	chmod +x $(srcdir)/wvAbw	
--	$(INSTALL) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
--	$(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
--	$(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
--	$(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
--	$(INSTALL) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
--	$(INSTALL) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
--	$(INSTALL) $(srcdir)/wvHtml $(bindir)/wvHtml
--	$(INSTALL) $(srcdir)/wvAbw $(bindir)/wvAbw
--	$(INSTALL) $(srcdir)/wvMime $(bindir)/wvMime
--	$(INSTALL) $(srcdir)/wvPS $(bindir)/wvPS
--	$(INSTALL) $(srcdir)/wvDVI $(bindir)/wvDVI
--	$(INSTALL) $(srcdir)/wvLatex $(bindir)/wvLatex
--	$(INSTALL) $(srcdir)/wvPDF $(bindir)/wvPDF
--	$(INSTALL) $(srcdir)/wvText $(bindir)/wvText
--	$(INSTALL) $(srcdir)/wvWml $(bindir)/wvWml
--	$(INSTALL) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
--	$(INSTALL) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
--	$(INSTALL) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
-+	$(INSTALL_PROGRAM) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
-+	$(INSTALL_PROGRAM) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
-+	$(INSTALL_PROGRAM) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
-+	$(INSTALL_PROGRAM) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
-+	$(INSTALL_PROGRAM) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
-+	$(INSTALL_SCRIPT) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
-+	$(INSTALL_SCRIPT) $(srcdir)/wvHtml $(bindir)/wvHtml
-+	$(INSTALL_SCRIPT) $(srcdir)/wvAbw $(bindir)/wvAbw
-+	$(INSTALL_SCRIPT) $(srcdir)/wvMime $(bindir)/wvMime
-+	$(INSTALL_SCRIPT) $(srcdir)/wvPS $(bindir)/wvPS
-+	$(INSTALL_SCRIPT) $(srcdir)/wvDVI $(bindir)/wvDVI
-+	$(INSTALL_SCRIPT) $(srcdir)/wvLatex $(bindir)/wvLatex
-+	$(INSTALL_SCRIPT) $(srcdir)/wvPDF $(bindir)/wvPDF
-+	$(INSTALL_SCRIPT) $(srcdir)/wvText $(bindir)/wvText
-+	$(INSTALL_SCRIPT) $(srcdir)/wvWml $(bindir)/wvWml
-+	$(INSTALL_SCRIPT) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
-+	$(INSTALL_SCRIPT) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
-+	$(INSTALL_SCRIPT) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
- 	$(INSTALL_DATA) $(src_mandir)/wvWare.1 $(mandir)/man1/
- 	$(INSTALL_DATA) $(src_mandir)/wvHtml.1 $(mandir)/man1/
- 	$(INSTALL_DATA) $(src_mandir)/wvLatex.1 $(mandir)/man1/
diff --git a/textproc/wv/files/patch-configure b/textproc/wv/files/patch-configure
new file mode 100644
index 000000000000..7dc89cfbe49e
--- /dev/null
+++ b/textproc/wv/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Jun 13 23:27:28 2003
++++ configure	Thu Jun 19 20:20:46 2003
+@@ -7533,6 +7533,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/wv/pkg-plist b/textproc/wv/pkg-plist
index 67cb76e1bed0..23fb3326c590 100644
--- a/textproc/wv/pkg-plist
+++ b/textproc/wv/pkg-plist
@@ -1,10 +1,9 @@
-bin/make_epses.sh
-bin/wv-incconfig
-bin/wv-libconfig
+bin/libwv-config
 bin/wvAbw
 bin/wvCleanLatex
 bin/wvConvert
 bin/wvDVI
+bin/wvDocBook
 bin/wvHtml
 bin/wvLatex
 bin/wvMime
@@ -19,6 +18,8 @@ bin/wvWml
 include/wv.h
 include/wvexporter.h
 lib/libwv.a
+lib/libwv.so
+lib/libwv.so.6
 share/wv/patterns/100.gif
 share/wv/patterns/101.gif
 share/wv/patterns/102.gif
@@ -460,13 +461,13 @@ share/wv/wingdingfont/99.gif
 share/wv/wvAbw.xml
 share/wv/wvCleanLaTeX.xml
 share/wv/wvConfig.xml
+share/wv/wvDocbook.xml
 share/wv/wvHtml.xml
 share/wv/wvLaTeX.xml
 share/wv/wvText.xml
 share/wv/wvWml.xml
 share/wv/wvXml.dtd
 share/wv/wvXml.xml
-@exec mkdir -p %D/share/wv/ttf
 @dirrm share/wv/wingdingfont
 @dirrm share/wv/patterns
-@unexec rm -rf %D/share/wv 2>/dev/null || true
+@dirrm share/wv