diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 13a146012dd..3c2c1fa1313 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2003/11/15 15:12:53 sturm Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=	"approximate grep (fast approximate pattern-matching tool)"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_FTP=	"may not modify"
 PERMIT_PACKAGE_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
+WANTLIB=		c
 
 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index a99b8357c78..3ca369fa6f7 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/04/07 20:00:49 sturm Exp $
+# $OpenBSD: Makefile,v 1.19 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=	"converts MSWord Documents to ASCII Text and PostScript"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		c
 
 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall -DNDEBUG" \
 		LD="${CC}"
diff --git a/textproc/aspell/core/Makefile b/textproc/aspell/core/Makefile
index ec78f3dce84..642b5d8304a 100644
--- a/textproc/aspell/core/Makefile
+++ b/textproc/aspell/core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/10/31 07:27:37 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/07 00:23:20 alek Exp $
 
 # memory fault at -O2/-O1 when building with gcc2. -O0 reveals some C++ issue
 # with gcc2 (same as the powerpc issue which is why it uses the gcc module).
@@ -25,6 +25,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c curses m stdc++ 
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} --enable-static
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 074dc3deb0b..520bbf06622 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2002/12/23 00:37:52 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=		"C-language sources to HTML converter"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 7f39a0204f1..c834c0a5046 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2004/03/02 20:56:09 ish Exp $
+# $OpenBSD: Makefile,v 1.22 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=	"MS Word ==> ASCII or TeX, Tk viewer included"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m 
 
 FLAVORS=	tk
 FLAVOR?=
diff --git a/textproc/clo++/Makefile b/textproc/clo++/Makefile
index 612ffe0e820..7c3cee92e69 100644
--- a/textproc/clo++/Makefile
+++ b/textproc/clo++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/09/27 01:21:02 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=	"command line parser generator"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c iconv m stdc++ z 
 
 MASTER_SITES=	${HOMEPAGE}/download/
 
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index b81c3881e91..c5d728548e1 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/12/16 02:47:36 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/12/07 00:23:20 alek Exp $
 
 COMMENT=		"accumulates and displays statistics from a diff file"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 NO_REGRESS=		Yes	# 'testing' directory not present
 
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 9e9c2b3246b..b2020fcc548 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2004/09/15 18:41:03 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2004/12/07 00:23:21 alek Exp $
 # $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $
 
 COMMENT=	"XML 1.0 parser written in C"
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		c 
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
diff --git a/textproc/gdiff/Makefile b/textproc/gdiff/Makefile
index a57896abf48..93bbc2dc49c 100644
--- a/textproc/gdiff/Makefile
+++ b/textproc/gdiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2004/08/11 20:55:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"GNU versions of the diff utilities"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=	${MASTER_SITE_GNU:=diffutils/}
 
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index e7da9f177ba..97e215b9e3a 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/10/11 17:21:58 weingart Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"text search engine"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=	"no fee"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
 DISTFILES=	glimpse-4.1.src.tar.gz
diff --git a/textproc/gpdf/Makefile b/textproc/gpdf/Makefile
index 6e62ac6538a..2bba79a3d39 100644
--- a/textproc/gpdf/Makefile
+++ b/textproc/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/10/10 16:46:53 sturm Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=		"PDF viewer for GNOME"
 
@@ -14,6 +14,13 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=gmodule-2.0.0.0 pangoxft-1.0.0.0 esd gtk-x11-2.0.0.0 gobject-2.0.0.0 \
+	art_lgpl_2 fontconfig gconf-2 gnomecanvas-2 pthread Xrender ICE \
+	ORBitCosNaming-2 glib-2.0.0.0 Xinerama pango-1.0.0.0 audiofile c \
+	pangoft2-1.0.0.0 gnomevfs-2 ORBit-2 jpeg z gnome-2 glade-2.0.0.0 \
+	gthread-2.0.0.0 xml2 gnomeprint-2-2 X11 atk-1.0.0.0 crypto stdc++ \
+	freetype gdk-x11-2.0.0.0 bonobo-activation bonobo-2 ssl m bonoboui-2 \
+	pangox-1.0.0.0 Xft SM gnome-keyring gdk_pixbuf-2.0.0.0 Xext popt
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gpdf/0.132/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index daa10d6bd26..8e38e26a651 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2004/09/29 07:51:17 xsa Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"gtk2 spelling checker"
 DISTNAME=	gtkspell-2.0.5
@@ -14,6 +14,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
+WANTLIB=		gmodule-2.0.0.0 pangoxft-1.0.0.0 glib-2.0.0.0 \
+			pangox-1.0.0.0 m X11 Xinerama pango-1.0.0.0 \
+			gobject-2.0.0.0 atk-1.0.0.0 Xft fontconfig freetype \
+			Xext Xrender
 
 USE_X11=	Yes
 
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 89bebd29e5f..a0363ee1798 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/10/26 15:22:48 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"LaTeX to html translator"
 
@@ -10,6 +10,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
+WANTLIB=		c m 
 
 BUILD_DEPENDS=	:ocaml-*:lang/ocaml
 
diff --git a/textproc/hgrep/Makefile b/textproc/hgrep/Makefile
index 6e060d09652..b97a1a7d1e1 100644
--- a/textproc/hgrep/Makefile
+++ b/textproc/hgrep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/01/04 19:09:52 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=		"grep wrapper with search highlighting"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c termcap 
 
 MASTER_SITES=		${HOMEPAGE}
 DISTFILES=		hgrep_04oct1999.tar.gz
diff --git a/textproc/idiff/Makefile b/textproc/idiff/Makefile
index 4cb784b6cab..2ddc551b12d 100644
--- a/textproc/idiff/Makefile
+++ b/textproc/idiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/11/15 15:12:53 sturm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/07 00:23:21 alek Exp $
 #
 
 COMMENT=	"powerful command-line front end to diff"
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/idiff ${PREFIX}/bin
diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index 6ab72d092d1..22b45103c2b 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2002/10/28 22:43:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"text search engine by CNIDR"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m stdc++ 
 
 MASTER_SITES=	ftp://ftp.cnidr.org/pub/software/Isearch/
 
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 47157278778..4b6af95c13d 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2004/11/17 01:19:28 alek Exp $
+# $OpenBSD: Makefile,v 1.39 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=		"interactive spelling checker"
 COMMENT-dutch=		"ispell dictionary for Dutch"
@@ -74,6 +74,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c termcap 
 
 .if defined(PACKAGING) && ${SUBPACKAGE} == "-german"
 PERMIT_PACKAGE_CDROM=	"no license"
diff --git a/textproc/lgrind/Makefile b/textproc/lgrind/Makefile
index 7dc65d34291..cde4771445b 100644
--- a/textproc/lgrind/Makefile
+++ b/textproc/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/06/26 07:35:09 xsa Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/07 00:23:21 alek Exp $
 
 COMMENT=	"LaTeX vgrind(1) look-alike"
 
@@ -19,6 +19,7 @@ PERMIT_PACKAGE_CDROM=	"May not be sold"
 PERMIT_DISTFILES_CDROM=	"May not be sold"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 WRKDIST=	${WRKDIR}
 
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 034a1313b18..7450be7a5ff 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.84 2004/11/11 20:55:28 espie Exp $
+# $OpenBSD: Makefile,v 1.85 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=		"XML parsing library"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m z 
 
 BUILD_DEPENDS=		:pkgconfig-*:devel/pkgconfig
 
diff --git a/textproc/libxml1/Makefile b/textproc/libxml1/Makefile
index 1e3d5f8f114..a3fb94908be 100644
--- a/textproc/libxml1/Makefile
+++ b/textproc/libxml1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/11/15 15:12:53 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"XML parsing library for GNOME"
 
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c z 
 
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 55c604731db..007e19b8db2 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2004/11/12 21:46:40 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=		"XSLT C Library for GNOME"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c gpg-error iconv intl m z 
 
 LIB_DEPENDS=		xml2.8::textproc/libxml \
 			gcrypt.12::security/libgcrypt
diff --git a/textproc/lq-sp/Makefile b/textproc/lq-sp/Makefile
index 0669a4c21e9..6382542f1d1 100644
--- a/textproc/lq-sp/Makefile
+++ b/textproc/lq-sp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/01/14 19:04:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"SGML parser and entity manager"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m stdc++ 
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 79738ccf492..3fcf2c3d05c 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/12 23:59:54 alek Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"graphical front end to Unix diff"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xmu Xt c 
 
 USE_MOTIF=	any
 CONFIGURE_STYLE= imake
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 03ec67bb2e8..8094bc9212c 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/04/20 22:36:17 brad Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"object-oriented SGML/XML parser toolkit and DSSSL engine"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m stdc++ 
 
 MAKE_FLAGS=	RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX} -fno-implicit-templates ${CXXFLAGS}" \
 		XDEFINES='-DJADE_MIF -DJADE_HTML -DSGML_CATALOG_FILES_DEFAULT=\"${PREFIX}/share/sgml/openjade/catalog\"'
diff --git a/textproc/p5-LibXML-Common/Makefile b/textproc/p5-LibXML-Common/Makefile
index 1690801a104..6b6f3501400 100644
--- a/textproc/p5-LibXML-Common/Makefile
+++ b/textproc/p5-LibXML-Common/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/01/17 15:58:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/07 00:23:22 alek Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -18,6 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		iconv m z 
 
 CONFIGURE_STYLE= perl
 
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 6349934ca06..ca0d1604ee8 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/01/17 15:58:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2004/12/07 00:23:22 alek Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -23,6 +23,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		iconv m z 
 
 CONFIGURE_STYLE= perl
 
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index 6a941c6b637..2d8593af98a 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2004/06/26 07:35:10 xsa Exp $
+# $OpenBSD: Makefile,v 1.22 2004/12/07 00:23:22 alek Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -25,6 +25,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		iconv m z 
 
 CONFIGURE_STYLE= perl
 
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 79126c9153d..0e0bcde73f4 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/02/29 01:03:32 avsm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/07 00:23:22 alek Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -19,6 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		expat iconv m 
 
 CONFIGURE_STYLE= perl
 CONFIGURE_ARGS=  EXPATLIBPATH="${LOCALBASE}/lib" EXPATINCPATH="${LOCALBASE}/include" SABLOTLIBPATH="${LOCALBASE}/lib" SABLOTINCPATH="${LOCALBASE}/include"
diff --git a/textproc/par/Makefile b/textproc/par/Makefile
index 9d23133dcfc..917317a2f40 100644
--- a/textproc/par/Makefile
+++ b/textproc/par/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/11/15 15:12:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"paragraph reflow for email"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=   ${HOMEPAGE}
 
diff --git a/textproc/pilot_makedoc/Makefile b/textproc/pilot_makedoc/Makefile
index 4718541ba5e..07ba01c7a87 100644
--- a/textproc/pilot_makedoc/Makefile
+++ b/textproc/pilot_makedoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/10/09 15:10:34 sturm Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/07 00:23:22 alek Exp $
 
 COMMENT=	"convert text into the Doc format used by PalmPilots"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	"no license"
 PERMIT_DISTFILES_CDROM=	"no license"
 PERMIT_DISTFILES_FTP=	"no license"
+WANTLIB=		c m stdc++ 
 
 WRKDIST=	${WRKDIR}
 ALL_TARGET=	pilot_makedoc
diff --git a/textproc/pinfo/Makefile b/textproc/pinfo/Makefile
index 3292ad48c0c..c017fb40b0c 100644
--- a/textproc/pinfo/Makefile
+++ b/textproc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/08/10 08:46:50 xsa Exp $
+# $OpenBSD: Makefile,v 1.3 2004/12/07 00:23:23 alek Exp $
 
 COMMENT="info viewer"
 MAINTAINER=Marc Espie <espie@openbsd.org>
@@ -13,6 +13,7 @@ PERMIT_DISTFILES_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_PACKAGE_CDROM=Yes
+WANTLIB=c ncurses 
 
 CONFIGURE_STYLE=autoconf
 AUTOCONF_VERSION=2.13
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 35431c197e2..cde88be4575 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2003/11/15 15:12:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.19 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"reverse compile man pages from formatted form"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=polyglotman/}
 
diff --git a/textproc/rxp/Makefile b/textproc/rxp/Makefile
index 0227f292e17..67fe21f34d5 100644
--- a/textproc/rxp/Makefile
+++ b/textproc/rxp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/06/19 21:00:45 jakob Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"validating namespace-aware XML parser"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=	ftp://ftp.cogsci.ed.ac.uk/pub/richard/
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 5562ace8468..82e6d70ffa5 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/08/10 08:46:50 xsa Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"fast, compact and portable XSL/XSLT processor"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m ncurses readline stdc++ 
 
 MASTER_SITES=	http://download-1.gingerall.cz/download/sablot/
 
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index a8018f07ce7..4a9a1e2da2f 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/08/10 08:46:50 xsa Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=		"Scrollkeeper Open Documentation Cataloging System"
 
@@ -18,6 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m z 
 
 MODULES=		devel/gettext
 
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 142b71b9f8e..b4c3b3073c0 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -4,7 +4,7 @@
 # Whom:			jfieber
 #
 # $FreeBSD: Makefile,v 1.9 1998/02/21 21:59:37 jfieber Exp $
-# $OpenBSD: Makefile,v 1.14 2003/11/15 15:12:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/07 00:23:23 alek Exp $
 #
 
 COMMENT=	"generate groff/HTML from linuxdoc/docbook SGML documents"
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 RUN_DEPENDS=	::textproc/openjade \
 		::textproc/linuxdoc \
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 34b656c2309..4447b172658 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2004/06/24 05:30:42 kevlo Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"C/C++,Prolog,Perl,PHP3 and Java sources to HTML converter"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		c m stdc++ 
 
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
 
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 2ab5e3759ea..ecbf9cee1a5 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2003/11/15 15:12:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"OO toolkit for SGML parsing and entity management"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m stdc++ 
 
 MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 
diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile
index faa49cb5894..4b48ab9d244 100644
--- a/textproc/spiff/Makefile
+++ b/textproc/spiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2003/11/15 15:12:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"very flexible diff-like program"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	"no fee"
 PERMIT_PACKAGE_FTP=	"may not modify"
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m 
 
 NO_REGRESS=	Yes
 
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index e5779e5f0f3..1d22d374dac 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/09/15 00:07:00 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=		"GNU text utilities"
 
@@ -10,6 +10,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c 
 
 MASTER_SITES=		${MASTER_SITE_GNU:=textutils/}
 
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 84bceec60cc..6be59a2bf22 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/02/21 01:18:08 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/07 00:23:23 alek Exp $
 
 COMMENT=	"RTF document converter"
 
@@ -18,6 +18,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		c 
 
 WRKDIST=	${WRKDIR}/unrtf
 MAKE_FLAGS=	CFLAGS='${CFLAGS}' CC='${CC}'
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index c40fde07ee4..1e4f8520ca7 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/04/13 20:23:59 xsa Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/07 00:23:24 alek Exp $
 
 COMMENT=	"curses-based URL ripper"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c ncurses 
 
 CONFIGURE_STYLE= gnu
 
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 8afaa51ac99..c618ddf4ea5 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2002/12/23 09:09:12 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:24 alek Exp $
 
 COMMENT=	"word differences between text files"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c termcap 
 
 CONFIGURE_STYLE=gnu dest old
 
diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index c3a66aeb39d..b7644915a91 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2004/11/06 18:19:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2004/12/07 00:23:24 alek Exp $
 
 COMMENT=	"PDF viewer for X"
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xp Xpm Xt c freetype m pthread \
+			stdc++ 
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 75aae731c02..0e10219a9b1 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/10/08 08:22:29 xsa Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/07 00:23:24 alek Exp $
 
 COMMENT=	"graphical file comparator and merge tool"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		X11 Xext c m png pthread stdc++ 
 
 BUILD_DEPENDS=	:bison-*:devel/bison \
 		:tmake->=1.10:devel/tmake
diff --git a/textproc/zoem/Makefile b/textproc/zoem/Makefile
index 24f1ff31b9a..786ae8a0dc2 100644
--- a/textproc/zoem/Makefile
+++ b/textproc/zoem/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/06/30 23:38:56 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/07 00:23:24 alek Exp $
 
 COMMENT=	"interpretive macro/programming language"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m 
 
 MASTER_SITES=	http://micans.org/zoem/src/