diff --git a/textproc/py-lxml/Makefile b/textproc/py-lxml/Makefile
index 4157ee240c9..cb274747ca2 100644
--- a/textproc/py-lxml/Makefile
+++ b/textproc/py-lxml/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2010/08/30 21:47:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	Python binding for the libxml2 and libxslt libraries
 
 MODPY_EGG_VERSION=	2.0.4
 DISTNAME=	lxml-${MODPY_EGG_VERSION}
 PKGNAME=	py-lxml-${MODPY_EGG_VERSION}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	textproc devel
 
 MAINTAINER=	Benoit Chesneau <benoitc@metavers.net>
@@ -21,11 +21,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-WANTLIB=	m xml2 z
+WANTLIB=	m xml2 z exslt xslt
 
 MODULES=	lang/python
 
-LIB_DEPENDS=	exslt,xslt::textproc/libxslt
+LIB_DEPENDS=	::textproc/libxslt
 
 MODPY_SETUPTOOLS=Yes
 
diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile
index c2334053047..499f3a95d0a 100644
--- a/textproc/py-yaml/Makefile
+++ b/textproc/py-yaml/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2010/08/30 21:47:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	YAML parser and emitter in Python
 
 MODPY_EGG_VERSION=3.08
 DISTNAME=	PyYAML-${MODPY_EGG_VERSION}
 PKGNAME=	py-yaml-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://pyyaml.org/wiki/PyYAML
@@ -20,9 +20,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://pyyaml.org/download/pyyaml/
 
+WANTLIB+=	yaml
+
 MODULES=	lang/python
 
-LIB_DEPENDS=	yaml::devel/libyaml
+LIB_DEPENDS=	::devel/libyaml
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/setup.cfg
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 6e1e1bfe6ef..418c43d34c6 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/19 07:54:26 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	curses-based URL ripper
 
 DISTNAME=	urlview-0.9
-PKGNAME=	${DISTNAME}p1
+REVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \
 		ftp://ftp.mutt.org/mutt/contrib/ \
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c ncurses 
+WANTLIB=		c ncurses
 
 CONFIGURE_STYLE= gnu
 
@@ -26,7 +26,8 @@ FLAVORS=	slang
 FLAVOR?=
 
 .if ${FLAVOR:L:Mslang}
-LIB_DEPENDS=	slang.14::devel/libslang
+WANTLIB+=	slang
+LIB_DEPENDS=	::devel/libslang
 CONFIGURE_ARGS=	--with-slang=${LOCALBASE}
 CONFIGURE_ENV=	LIBS=-lcurses
 .endif
diff --git a/textproc/wdg-sgml-lib/Makefile b/textproc/wdg-sgml-lib/Makefile
index 4f8f306446e..cbfe3cba9f6 100644
--- a/textproc/wdg-sgml-lib/Makefile
+++ b/textproc/wdg-sgml-lib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 20:59:42 merdely Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	collection of HTML, XHTML, ISO-HTML, WML and MathML DTDs
 
 DISTNAME=	wdg-sgml-lib-1.1.4
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://www.htmlhelp.com/tools/validator/offline/
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 03fbdbe7c1f..61b648512dc 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/19 07:54:26 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	small utility used to manipulate SGML and XML catalogs
 
 DISTNAME=	xmlcatmgr-2.2
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://xmlcatmgr.sourceforge.net/
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index ac09701f410..afab271dc6d 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/19 07:54:26 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	front-end to an XSL toolchain
 
 DISTNAME=	xmlto-0.0.18
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	textproc
 
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index b6dca94525e..3fbe044e002 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/24 21:38:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/10 22:24:16 jasper Exp $
 
 COMMENT=	graphical file comparator and merge tool
 
 DISTNAME=	xxdiff-3.1
-PKGNAME=	${DISTNAME}p1
+REVISION=	2
 CATEGORIES=	textproc x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}