5 files changed, 50 insertions, 7 deletions

diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 47d4a8e54b1c..8bc38d5fdd9e 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wv
-PORTVERSION=	0.6.7
+PORTVERSION=	0.7.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -16,7 +16,8 @@ MAINTAINER=	mzaki@e-mail.ne.jp
 LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libwmf=${LOCALBASE} --with-libiconv=${LOCALBASE} \
 		--with-png=${LOCALBASE} --with-exporter
 
diff --git a/textproc/wv/distinfo b/textproc/wv/distinfo
index e4ed2d7f7586..16f88a67ac8d 100644
--- a/textproc/wv/distinfo
+++ b/textproc/wv/distinfo
@@ -1 +1 @@
-MD5 (wv-0.6.7.tar.gz) = c20bb0b131a04b40a726ced2e26ae717
+MD5 (wv-0.7.0.tar.gz) = 85dd21ed7788c523751ff94bf011a416
diff --git a/textproc/wv/files/patch-Makefile.in b/textproc/wv/files/patch-Makefile.in
index eaf6db2d4edc..e807ab12543b 100644
--- a/textproc/wv/files/patch-Makefile.in
+++ b/textproc/wv/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun May  6 02:52:01 2001
-+++ Makefile.in	Fri May 11 03:27:48 2001
-@@ -63,6 +63,8 @@
+--- Makefile.in.orig	Mon Oct 15 18:09:43 2001
++++ Makefile.in	Sat Nov 17 08:24:35 2001
+@@ -61,6 +61,8 @@
  RM = rm
  
  INSTALL = @INSTALL@
@@ -9,7 +9,16 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  @SET_MAKE@
-@@ -429,31 +431,25 @@
+@@ -81,7 +83,7 @@
+ VPATH = @srcdir@
+ 
+ DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\"
+-CPPFLAGS = @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @CPPFLAGS@
++CPPFLAGS = @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @ICONV_CFLAGS@ @CPPFLAGS@
+ CFLAGS = @CFLAGS@ -ansi -pedantic
+ INCLUDES = -I. -I./ -I$(srcdir)/ -I$(srcdir)/magick/  -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/
+ 
+@@ -422,31 +424,25 @@
  	$(includedir)	
  
  install: installdirs all
diff --git a/textproc/wv/files/patch-aa b/textproc/wv/files/patch-aa
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/textproc/wv/files/patch-aa
+++ /dev/null
diff --git a/textproc/wv/files/patch-ltmain.sh b/textproc/wv/files/patch-ltmain.sh
new file mode 100644
index 000000000000..7338488694a9
--- /dev/null
+++ b/textproc/wv/files/patch-ltmain.sh
@@ -0,0 +1,33 @@
+--- ltmain.sh.orig	Wed Sep 26 23:26:27 2001
++++ ltmain.sh	Sat Nov 17 08:35:28 2001
+@@ -1043,7 +1043,7 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4210,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"