5 files changed, 14 insertions, 53 deletions
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 5d5db7ac3ce..8b1eeef9c56 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/11 11:23:14 wiz Exp $
 #
 
-DISTNAME=		wv-0.7.0
-PKGREVISION=		2
+DISTNAME=		wv-0.7.2
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
@@ -13,9 +12,8 @@ COMMENT=		Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter
 # not detected by configure, causes conflicts with the one coming with wv
 #CONFLICTS+=		libgetopt-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	wv-incconfig wv-libconfig
-
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 MAKE_ENV+=		RM="${RM} -f"
@@ -26,9 +24,8 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING CREDITS INSTALL KNOWN-BUGS \
 		README help/Docs/XML_Tags ${PREFIX}/share/doc/wv
 
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../graphics/ImageMagick/buildlink.mk"
-.include "../../graphics/libwmf/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../graphics/ImageMagick/buildlink2.mk"
+.include "../../graphics/libwmf/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/wv/PLIST b/converters/wv/PLIST
index 5281bca0056..0c04b6f5dbd 100644
--- a/converters/wv/PLIST
+++ b/converters/wv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:51:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/11 11:23:14 wiz Exp $
 bin/make_epses.sh
 bin/wv-incconfig
 bin/wv-libconfig
@@ -12,7 +12,6 @@ bin/wvMime
 bin/wvPDF
 bin/wvPS
 bin/wvRTF
-bin/wvSimpleCLX
 bin/wvSummary
 bin/wvText
 bin/wvVersion
diff --git a/converters/wv/buildlink.mk b/converters/wv/buildlink.mk
deleted file mode 100644
index 5b82b4aaaab..00000000000
--- a/converters/wv/buildlink.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
-#
-# This Makefile fragment is included by packages that use wv.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.wv to the dependency pattern
-#     for the version of wv desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-#     search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-#     path.
-
-.if !defined(WV_BUILDLINK_MK)
-WV_BUILDLINK_MK=	# defined
-
-.include "../../mk/bsd.buildlink.mk"
-
-BUILDLINK_DEPENDS.wv?=	wv>=0.7.0nb2
-BUILD_DEPENDS+=		${BUILDLINK_DEPENDS.wv}:../../converters/wv
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.wv=wv
-BUILDLINK_PREFIX.wv_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.wv=	include/wv.h
-BUILDLINK_FILES.wv+=	lib/libwv.*
-
-BUILDLINK_TARGETS.wv=	wv-buildlink
-BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.wv}
-
-pre-configure: ${BUILDLINK_TARGETS.wv}
-wv-buildlink: _BUILDLINK_USE
-
-.endif	# WV_BUILDLINK_MK
diff --git a/converters/wv/buildlink2.mk b/converters/wv/buildlink2.mk
index a26182b89a0..e26d1f288cb 100644
--- a/converters/wv/buildlink2.mk
+++ b/converters/wv/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 11:23:15 wiz Exp $
 
 .if !defined(WV_BUILDLINK2_MK)
 WV_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		wv
-BUILDLINK_DEPENDS.wv?=		wv>=0.7.0nb2
+BUILDLINK_DEPENDS.wv?=		wv>=0.7.2
 BUILDLINK_PKGSRCDIR.wv?=	../../converters/wv
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wv=wv
diff --git a/converters/wv/distinfo b/converters/wv/distinfo
index 9b2111837ce..578436b3732 100644
--- a/converters/wv/distinfo
+++ b/converters/wv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/12/10 14:30:14 taca Exp $
+$NetBSD: distinfo,v 1.6 2002/09/11 11:23:15 wiz Exp $
 
-SHA1 (wv-0.7.0.tar.gz) = 4f07cc0bf6f73ab3894b38f104d9f14c9a2a6682
-Size (wv-0.7.0.tar.gz) = 1239940 bytes
+SHA1 (wv-0.7.2.tar.gz) = 5c7ffd3ce310fe6c5aa183af3fd1f6d4e01b4be5
+Size (wv-0.7.2.tar.gz) = 1187060 bytes
 SHA1 (patch-ad) = 820e595779998246e54a2a4c234873d563cb2bf0
 SHA1 (patch-ae) = 58b4cadf0276b1dc25bd737623336b4fc90093f0
 SHA1 (patch-aj) = f141b74b49611c954d4de24d050e5f68274ab26e