diff --git a/x11/xdu/Makefile b/x11/xdu/Makefile
index 58128875e59..e92ee4a28ed 100644
--- a/x11/xdu/Makefile
+++ b/x11/xdu/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/17 15:03:17 alek Exp $
 
 COMMENT=	"graphic disk usage viewer"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c
 
 HOMEPAGE=		http://sd.wareonearth.com/~phil/xdu/
 
diff --git a/x11/xfed/Makefile b/x11/xfed/Makefile
index a16fbf18e24..b011af3b933 100644
--- a/x11/xfed/Makefile
+++ b/x11/xfed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2002/10/29 19:48:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/17 15:03:17 alek Exp $
 
 COMMENT=	"X11 fonts (.bdf files) editor"
 
@@ -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
 CONFIGURE_STYLE=	imake
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index 9f02437686b..1306367fbdb 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/17 15:03:18 alek Exp $
 # ATTENTION: It does not work in > 256 color modes, please fix
 # it if you can.
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xpm c m
 
 USE_X11=	Yes
 NO_REGRESS=	Yes
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index af16aa244fb..e26da01ed69 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/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/17 15:03:18 alek Exp $
 
 COMMENT=	"fish swim in the background of your screen"
 
@@ -11,6 +11,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
 
 USE_X11=	Yes
 CONFIGURE_STYLE= imake noman
diff --git a/x11/xfm/Makefile b/x11/xfm/Makefile
index 0e6a85ff6a3..aaf564fe955 100644
--- a/x11/xfm/Makefile
+++ b/x11/xfm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"X11 File Manager"
 
@@ -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 Xp Xpm Xt c
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 86352e4503e..6a38e8de619 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2003/05/12 06:48:20 margarida Exp $
+# $OpenBSD: Makefile,v 1.28 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=		"GUI toolkit for X11"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		GL X11 Xext Xpm c jpeg m
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index db9e0550473..00bb1b0b976 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2004/08/10 11:16:44 xsa Exp $
+# $OpenBSD: Makefile,v 1.23 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"display the Earth on X11"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 c m pthread stdc++
 
 USE_X11=		Yes
 MODULES=		x11/qt3
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 784662402a9..c7fb3b54dfe 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/10/08 17:13:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.20 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"X11 image grabber"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 523cfafc6df..d2473a7ae78 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/03/31 14:59:29 sturm Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"X11 keyboard accessibility tool"
 COMMENT-gui=	"GUI for xkbset"
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 c 
 
 HOMEPAGE=	http://www.math.missouri.edu/~stephen/software/#xkbset
 MASTER_SITES=	http://www.math.missouri.edu/~stephen/software/xkbset/
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index a83a1ba0234..a96abf1eebf 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/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/17 15:03:18 alek Exp $
 
 COMMENT=	"keymap editor for the X window system"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xt c 
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 5bd8feb6426..6fb6867cfad 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2004/11/17 18:31:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"graphics file viewer for X11"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 c jpeg m z 
 
 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}
 MASTER_SITES0=	ftp://ftp.debian.org/debian/pool/main/x/xloadimage/ \
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index d8b454a3b01..638a5b8c0e6 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"simple logout button"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c 
 
 MASTER_SITES=	ftp://ftp.tu-darmstadt.de/pub/X11/other/
 EXTRACT_SUFX=	.tar.Z
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 54bfeac45b9..37d1a8a2d4b 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/05/24 08:18:27 xsa Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"moving mascot on your X11 screen"
 
@@ -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 Xaw Xext Xmu Xp Xpm Xt c m 
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/x11/xmbdfed/Makefile b/x11/xmbdfed/Makefile
index f6ae1474a11..963df5973e1 100644
--- a/x11/xmbdfed/Makefile
+++ b/x11/xmbdfed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/04/05 21:41:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"Motif tool for editing X11 bitmap fonts"
 
@@ -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 Xp Xpm Xt c freetype 
 
 MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index e673c1f866b..5aa77c9278a 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2004/05/24 08:31:13 xsa Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"mold spreading over your X11 screen"
 
@@ -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=		X11 Xext c m 
 
 MASTER_SITES=	ftp://cclub.cc.tut.ac.jp/pub/xwin/
 
diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 27b7035ac4d..1909f10ef7c 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/11/11 05:16:29 jcs Exp $
+# $OpenBSD: Makefile,v 1.2 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"displays text on your screen"
 
@@ -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 Xinerama Xt c pthread 
 
 MASTER_SITES=	http://www.ignavus.net/
 
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index b97620fb5ec..9e95fa275bc 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/05/18 08:45:33 xsa Exp $
+# $OpenBSD: Makefile,v 1.17 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"PostIt (R) messages onto your X11 screen"
 
@@ -18,6 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c 
 
 USE_X11=	Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xpostitPlus/Makefile b/x11/xpostitPlus/Makefile
index f427abf5578..350816ddc39 100644
--- a/x11/xpostitPlus/Makefile
+++ b/x11/xpostitPlus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2003/11/04 23:31:05 fgsch Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"PostIt (R) messages onto your X11 screen"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c 
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index f0967e10faa..bda4f3509de 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"display a dialog box and prompt user for text"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xt c 
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 06db3ea281d..eaa7f715801 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2004/10/05 14:15:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=		"screen saver and locker for the X Window System"
 
@@ -15,6 +15,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	GL GLU ICE SM X11 Xcursor Xext Xft Xinerama Xmu Xrandr Xrender \
+		Xss Xt Xxf86misc Xxf86vm atk-1.0.0.0 c fontconfig freetype \
+		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 pthread util z 
 
 MASTER_SITES=		http://www.jwz.org/xscreensaver/
 
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index e2d0adde501..4fe00a430db 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/11/21 19:01:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=		"snowy and Santa-y desktop"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	"vague license"
 PERMIT_PACKAGE_FTP=	"vague license"
 PERMIT_DISTFILES_CDROM=	"vague license"
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext Xpm c m 
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 0e7b4c95e1e..4412d975125 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.16 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"X11 trippy color-cycling toy"
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c m 
 
 USE_X11=	Yes
 CONFIGURE_STYLE=imake
diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile
index e88992287db..ea7309c91a2 100644
--- a/x11/xtattr/Makefile
+++ b/x11/xtattr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"changing xterm attributes"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	"no license"
 PERMIT_DISTFILES_CDROM=	"no license"
 PERMIT_DISTFILES_FTP=	"no license"
+WANTLIB=		c 
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index 7c0b5b4c922..57315072233 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/07 19:51:12 sturm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"dynamically change some settings of an xterm"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		c 
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clts/}
 
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index e210f26ae9d..62923b786ca 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2003/02/04 21:02:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"full-screen image to adjust your monitor"
 
@@ -10,6 +10,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c 
 
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 4077a1f9f6f..298e6ff26eb 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/17 15:03:18 alek Exp $
 
 COMMENT=	"tool startup utility for X11"
 
@@ -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
 CONFIGURE_STYLE=	imake
diff --git a/x11/xtraceroute/Makefile b/x11/xtraceroute/Makefile
index 7738d82a3f0..3d9b50f730d 100644
--- a/x11/xtraceroute/Makefile
+++ b/x11/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.23 2004/12/17 15:03:18 alek Exp $
 # $NetBSD: Makefile,v 1.4 1999/03/04 08:58:42 tron Exp $
 
 COMMENT=	"graphical version of traceroute"
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		GL GLU X11 Xext Xi c gdk glib gmodule gtk iconv intl \
+			jpeg m tiff z 
 
 USE_X11=	Yes
 CONFIGURE_STYLE= autoconf
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 6cef83b8139..2ac1c97bf2c 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/06/24 02:52:43 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/17 15:03:19 alek Exp $
 
 COMMENT=		"xvkbd - virtual keyboard for X window system"
 
@@ -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 Xp Xpm Xt Xtst c 
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 041ab7634ac..45de525bc72 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/17 15:03:19 alek Exp $
 
 COMMENT=	"X11 window interface tool"
 
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c 
 
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=utilities/}
 
diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile
index 9b41940071c..458b562cd2e 100644
--- a/x11/xwrits/Makefile
+++ b/x11/xwrits/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/10/08 08:22:29 xsa Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/17 15:03:19 alek Exp $
 
 COMMENT=	"typing break alarm and timer"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=		ICE SM X11 Xext Xinerama c m 
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 76fb5cb84c8..992174a271f 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2003/10/08 17:13:20 sturm Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/17 15:03:19 alek Exp $
 
 COMMENT=	"magnify, rotate, mirror the image on the X11 screen"
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	"may not sell"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"may not sell"
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xext c 
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake