diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile
index a8455692d96..f5f302cf7bf 100644
--- a/x11/sawfish/Makefile
+++ b/x11/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/06/25 00:16:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/19 17:27:00 alek Exp $
 
 COMMENT=	"extensible window manager"
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xi Xinerama c gdk gmodule iconv intl \
+			jpeg m png tiff ungif z
 
 GNU_ARCH=	${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER}
 SUBST_VARS=	GNU_ARCH VERSION
diff --git a/x11/skippy/Makefile b/x11/skippy/Makefile
index 3a97de139d3..d25296496ad 100644
--- a/x11/skippy/Makefile
+++ b/x11/skippy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/10/15 18:50:18 fgsch Exp $
+# $OpenBSD: Makefile,v 1.2 2004/12/19 17:27:01 alek Exp $
 
 COMMENT=		"a full-screen X11 task-switcher like Apple's Expose"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xft Xinerama Xrender c fontconfig freetype m
 
 USE_X11=		Yes
 
diff --git a/x11/sliderule/Makefile b/x11/sliderule/Makefile
index 388d8d6d4ac..74868f584d1 100644
--- a/x11/sliderule/Makefile
+++ b/x11/sliderule/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/10/08 17:13:17 sturm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:01 alek Exp $
 
 COMMENT=	"slide rule component of X11R3's xcalc"
 
@@ -10,6 +10,7 @@ PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	"no license"
 PERMIT_DISTFILES_CDROM=	"no license"
 PERMIT_DISTFILES_FTP=	"no license"
+WANTLIB=		X11 Xext c m
 
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/x11/swisswatch/Makefile b/x11/swisswatch/Makefile
index 8a7605d932d..de2e2aface0 100644
--- a/x11/swisswatch/Makefile
+++ b/x11/swisswatch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2004/05/18 08:45:33 xsa Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/19 17:27:01 alek Exp $
 
 COMMENT=	"Swiss railway clock emulation"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	"no license"
 PERMIT_DISTFILES_CDROM=	"no license"
 PERMIT_DISTFILES_FTP=	"no license"
+WANTLIB=		ICE SM X11 Xext Xmu Xt c m
 
 USE_X11=	Yes
 
diff --git a/x11/tk/8.0/Makefile b/x11/tk/8.0/Makefile
index ecc34404d65..24bfb99bacc 100644
--- a/x11/tk/8.0/Makefile
+++ b/x11/tk/8.0/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/07/04 05:37:08 brad Exp $
+# $OpenBSD: Makefile,v 1.19 2004/12/19 17:27:01 alek Exp $
 # $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
 
 COMMENT=	"graphical toolkit for Tcl"
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 c m
 
 MAKE_FLAGS=	CFLAGS="${CFLAGS}"
 FAKE_FLAGS=	INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
diff --git a/x11/tk/8.3/Makefile b/x11/tk/8.3/Makefile
index 9bca0f37ba6..339959c73f5 100644
--- a/x11/tk/8.3/Makefile
+++ b/x11/tk/8.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/07/04 05:37:09 brad Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/19 17:27:01 alek Exp $
 
 COMMENT=	"graphical toolkit for Tcl"
 
@@ -18,6 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c m
 
 LIB_DEPENDS=    tcl83.1.3:tcl-${VERSION}:lang/tcl/8.3
 
diff --git a/x11/tk/8.4/Makefile b/x11/tk/8.4/Makefile
index e12d28e4107..fe9dfa422d0 100644
--- a/x11/tk/8.4/Makefile
+++ b/x11/tk/8.4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/08/07 06:16:38 kevlo Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/19 17:27:01 alek Exp $
 
 COMMENT=	"graphical toolkit for Tcl"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 c m
 
 LIB_DEPENDS=    tcl84:tcl->=8.4:lang/tcl/8.4
 
diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile
index 5da8cbbddd4..8379af6ed44 100644
--- a/x11/tktable/Makefile
+++ b/x11/tktable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/24 02:35:26 kevlo Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=	"tk extension"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tktable/}
 
diff --git a/x11/treewm/Makefile b/x11/treewm/Makefile
index 74eae1a19f5..076e98a5138 100644
--- a/x11/treewm/Makefile
+++ b/x11/treewm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/02/08 01:13:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=		"tree window manager"
 DISTNAME=		treewm-0.4.5
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xmu Xpm Xt Xxf86vm c m stdc++
 
 USE_GMAKE=		Yes
 USE_X11=		Yes
diff --git a/x11/ttmkfdir/Makefile b/x11/ttmkfdir/Makefile
index 199f223ddee..1b3bac9d0c1 100644
--- a/x11/ttmkfdir/Makefile
+++ b/x11/ttmkfdir/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/07/08 19:11:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=	"create fonts.scale file for the TrueType font server"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c freetype m stdc++
 
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/tvtwm/Makefile b/x11/tvtwm/Makefile
index a4983d77fb1..642cf1271ee 100644
--- a/x11/tvtwm/Makefile
+++ b/x11/tvtwm/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: ports/x11-wm/tvtwm/Makefile,v 1.17 1999/08/31 06:53:15 mharo Exp $
-# $OpenBSD: Makefile,v 1.17 2004/01/25 21:10:52 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=	"twm with a virtual desktop"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xmu Xpm Xt c
 
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=window_managers/}
 
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index fd045bd299a..960976bb496 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=	"hides idle X11 cursor"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c
 
 USE_X11=	Yes
 
diff --git a/x11/viewfax/Makefile b/x11/viewfax/Makefile
index cde4e120349..5f2604329f5 100644
--- a/x11/viewfax/Makefile
+++ b/x11/viewfax/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/05/17 16:32:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/19 17:27:02 alek Exp $
 # $FreeBSD: Makefile,v 1.9 1998/03/07 23:26:23 jmz Exp $
 
 COMMENT=	"display files containing g3 and/or g4 coded fax pages"
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c
 
 USE_X11=	Yes
 NO_REGRESS=	Yes
diff --git a/x11/wampager/Makefile b/x11/wampager/Makefile
index c74a4abc04e..ab788014427 100644
--- a/x11/wampager/Makefile
+++ b/x11/wampager/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/06/22 22:48:02 sturm Exp $
+# $OpenBSD: Makefile,v 1.6 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=		"waimea mini pager"
 
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 19ca2885e10..7f649a0c7ac 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2004/08/10 11:16:44 xsa Exp $
+# $OpenBSD: Makefile,v 1.59 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=		'window manager that emulates NEXTSTEP(tm)'
 COMMENT-lang=		"language subpackage for Window Maker"
@@ -54,6 +54,7 @@ LIB_DEPENDS=		jpeg.62::graphics/jpeg \
 			tiff.35::graphics/tiff \
 			png.2::graphics/png \
 			ungif.5::graphics/libungif
+WANTLIB=		X11 Xext Xpm c m z
 .endif
 
 post-patch:
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 1e9d6aa7097..908e0c0ce2b 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/04/27 06:54:26 wilfried Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=		'wm-dockapp; application launching program'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 MASTER_SITES=		${HOMEPAGE}wmbutton/
 
diff --git a/x11/wmcalclock/Makefile b/x11/wmcalclock/Makefile
index 88fd1788f68..b6fbb29fd06 100644
--- a/x11/wmcalclock/Makefile
+++ b/x11/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/09/17 14:46:07 wilfried Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:02 alek Exp $
 
 COMMENT=		'wm-dockapp; calendar/clock'
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
 
diff --git a/x11/wmclock/Makefile b/x11/wmclock/Makefile
index 25267d76788..b2eb89c1649 100644
--- a/x11/wmclock/Makefile
+++ b/x11/wmclock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/05/10 07:26:34 xsa Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=		"Window Maker dock.app clock"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index 0e1b706d371..1b4c0bb8921 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/02/19 02:50:25 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2004/12/19 17:27:03 alek Exp $
 
 # 64-bit/endian issue?
 NOT_FOR_ARCHS=	sparc64
@@ -15,6 +15,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
+WANTLIB=		ICE SM X11 Xmu c iconv intl
 
 USE_X11=	Yes
 
diff --git a/x11/wmdate/Makefile b/x11/wmdate/Makefile
index 55060740c48..4a3201e24ce 100644
--- a/x11/wmdate/Makefile
+++ b/x11/wmdate/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2002/09/17 14:35:04 wilfried Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=		'wm-dockapp; shows the current date'
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 LIB_DEPENDS=		dockapp::devel/libdockapp
 
diff --git a/x11/wmfishtime/Makefile b/x11/wmfishtime/Makefile
index 53ca9006504..337e651f51e 100644
--- a/x11/wmfishtime/Makefile
+++ b/x11/wmfishtime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2002/09/17 15:22:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=		'wm-dockapp; clock application with clock, date and fish'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m
 
 MASTER_SITES=		${HOMEPAGE}software/
 
diff --git a/x11/wmi/Makefile b/x11/wmi/Makefile
index ff2a612139e..4a33979c598 100644
--- a/x11/wmi/Makefile
+++ b/x11/wmi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/10/17 07:36:55 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=	"window manager improved - key driven window manager"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xft Xrender c fontconfig freetype m stdc++
 
 MASTER_SITES=	http://download.berlios.de/wmi/
 
diff --git a/x11/wminfo/Makefile b/x11/wminfo/Makefile
index 7ae1a194eb7..07a209668f0 100644
--- a/x11/wminfo/Makefile
+++ b/x11/wminfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2003/04/27 07:03:30 wilfried Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=		'wm-dockapp; displays scrolling text'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 MASTER_SITES=		http://kling.mine.nu/files/
 
diff --git a/x11/wmitime/Makefile b/x11/wmitime/Makefile
index 341166df043..0b56d2acf8d 100644
--- a/x11/wmitime/Makefile
+++ b/x11/wmitime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2002/09/17 15:22:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/19 17:27:03 alek Exp $
 
 COMMENT=		'wm-dockapp; shows the date, time, and Internet time'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c m
 
 MASTER_SITES=		${HOMEPAGE}downloads/
 
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 57f7a1f1874..70df1dddb64 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/10/29 19:48:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/19 17:27:04 alek Exp $
 
 COMMENT=		'wm-dockapp; A popup menu of icons that launch programs'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c m
 
 MASTER_SITES=		http://www.fcoutant.freesurf.fr/download/
 
@@ -27,6 +28,7 @@ FLAVOR?=
 .if ${FLAVOR:L:Mgdk_pixbuf}
 MAKE_FLAGS=		GDKPIXBUF=1
 LIB_DEPENDS+=		gdk_pixbuf_xlib::graphics/gdk-pixbuf
+WANTLIB+=		gdk glib gmodule gtk intl jpeg png tiff z
 .endif
 
 WRKDIST=		${WRKDIR}/wmmenu
diff --git a/x11/wmpinboard/Makefile b/x11/wmpinboard/Makefile
index 8b8e8a76ed8..62736eb9dcd 100644
--- a/x11/wmpinboard/Makefile
+++ b/x11/wmpinboard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/02/01 10:54:23 wilfried Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/19 17:27:04 alek Exp $
 
 COMMENT=		'wm-dockapp; resembling a miniature pin board'
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/wmtheme/Makefile b/x11/wmtheme/Makefile
index 018536caa77..447bf635479 100644
--- a/x11/wmtheme/Makefile
+++ b/x11/wmtheme/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/09/15 00:07:00 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:04 alek Exp $
 
 COMMENT=		"window manager theme utility"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wmtheme/}
 
diff --git a/x11/wmthemeinstall/Makefile b/x11/wmthemeinstall/Makefile
index 7f3c927da26..3207229ecd6 100644
--- a/x11/wmthemeinstall/Makefile
+++ b/x11/wmthemeinstall/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/09/17 14:35:04 wilfried Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:04 alek Exp $
 # $FreeBSD: ports/x11-wm/wmthemeinstall/Makefile,v 1.5 2000/10/05 06:42:57 reg Exp $
 
 COMMENT=		'neat theme manager for Window Maker'
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m z
 
 RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 LIB_DEPENDS=		gtk.1,gdk.1::x11/gtk+
diff --git a/x11/wmtime/Makefile b/x11/wmtime/Makefile
index 972960e0208..b1302daab01 100644
--- a/x11/wmtime/Makefile
+++ b/x11/wmtime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/19 17:27:04 alek Exp $
 
 COMMENT=	"time/date applet for WindowMaker"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		X11 Xext Xpm c m
 
 WRKDIST=        ${WRKDIR}/wmtime.app/
 WRKSRC=		${WRKDIST}/wmtime/
diff --git a/x11/wmtz/Makefile b/x11/wmtz/Makefile
index 2c93a084f2b..746c23fbbcf 100644
--- a/x11/wmtz/Makefile
+++ b/x11/wmtz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2002/09/17 14:46:07 wilfried Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/19 17:27:05 alek Exp $
 
 COMMENT=		'wm-dockapp; displays the time in different time zones'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c m
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 219e83a6e54..4655ab7fcc9 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/09/17 14:46:07 wilfried Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:05 alek Exp $
 
 COMMENT=		'wm-dockapp; weather monitor'
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c
 
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
 
diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile
index 4e6085da812..60dc989f90c 100644
--- a/x11/wmx/Makefile
+++ b/x11/wmx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/19 17:27:05 alek Exp $
 
 COMMENT=	"minimal window manager"
 
@@ -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=		X11 Xext Xpm c m stdc++
 
 USE_X11=	Yes
 CONFIGURE_STYLE=	gnu
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index f2f342cb9ca..5de7141188b 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2002/12/01 13:41:34 wilfried Exp $
+# $OpenBSD: Makefile,v 1.24 2004/12/19 17:27:05 alek Exp $
 
 COMMENT=		'color vt102 terminal emulator with transparency support'
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xpm c util
 
 MASTER_SITES=		http://largo.windowmaker.org/files/