5 files changed, 35 insertions, 13 deletions

diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 64b96d2ca26d..58523b413127 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wv
-PORTVERSION=	0.7.6
+PORTVERSION=	1.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -18,13 +18,11 @@ LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf
 RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 USE_GETOPT_LONG=	yes
-USE_REINPLACE=	yes
+USE_GNOME=	gnometarget pkgconfig
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-exporter --without-glib
+CONFIGURE_ARGS=	--with-exporter --without-glib --with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
 INSTALLS_SHLIB=	yes
 
@@ -35,7 +33,4 @@ 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 21957f65d938..73bedeadb04a 100644
--- a/textproc/wv/distinfo
+++ b/textproc/wv/distinfo
@@ -1 +1 @@
-MD5 (wv-0.7.6.tar.gz) = 28c46d6676e0fce6a19e3cb730b04556
+MD5 (wv-1.0.0.tar.gz) = 5e9675a8676cb1c1f6b8ab05af883178
diff --git a/textproc/wv/files/patch-GNUmakefile.in b/textproc/wv/files/patch-GNUmakefile.in
new file mode 100644
index 000000000000..559f8235c128
--- /dev/null
+++ b/textproc/wv/files/patch-GNUmakefile.in
@@ -0,0 +1,11 @@
+--- GNUmakefile.in.orig	Sat Sep 13 09:37:27 2003
++++ GNUmakefile.in	Sun Sep 14 18:12:59 2003
+@@ -281,7 +281,7 @@
+ 
+ OTHERSCRIPTS = wvMime
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ 
+ pkgconfig_DATA = wv-1.0.pc
+ 
diff --git a/textproc/wv/files/patch-config.h.in b/textproc/wv/files/patch-config.h.in
new file mode 100644
index 000000000000..e832353260d6
--- /dev/null
+++ b/textproc/wv/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig	Sat Sep 13 09:37:53 2003
++++ config.h.in	Sun Sep 14 18:13:35 2003
+@@ -38,9 +38,6 @@
+ /* Define if you have libxml2 */
+ #undef HAVE_LIBXML2
+ 
+-/* Define to 1 if you have the <malloc.h> header file. */
+-#undef HAVE_MALLOC_H
+-
+ /* Define to 1 if you have the `memcpy' function. */
+ #undef HAVE_MEMCPY
+ 
diff --git a/textproc/wv/pkg-plist b/textproc/wv/pkg-plist
index 23fb3326c590..a321accc9a91 100644
--- a/textproc/wv/pkg-plist
+++ b/textproc/wv/pkg-plist
@@ -1,4 +1,3 @@
-bin/libwv-config
 bin/wvAbw
 bin/wvCleanLatex
 bin/wvConvert
@@ -15,11 +14,14 @@ bin/wvText
 bin/wvVersion
 bin/wvWare
 bin/wvWml
-include/wv.h
-include/wvexporter.h
+include/wv/libole2/ms-ole-summary.h
+include/wv/libole2/ms-ole.h
+include/wv/wv.h
+include/wv/wvexporter.h
 lib/libwv.a
 lib/libwv.so
-lib/libwv.so.6
+lib/libwv-1.0.so.0
+libdata/pkgconfig/wv-1.0.pc
 share/wv/patterns/100.gif
 share/wv/patterns/101.gif
 share/wv/patterns/102.gif
@@ -471,3 +473,5 @@ share/wv/wvXml.xml
 @dirrm share/wv/wingdingfont
 @dirrm share/wv/patterns
 @dirrm share/wv
+@dirrm include/wv/libole2
+@dirrm include/wv