From d712b417cc2cc25c2dfb213740ed7980996bd17c Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Sun, 8 Apr 2007 16:33:41 +0000
Subject: [PATCH] more WANTLIB fixes

---
 devel/fox/Makefile                  | 8 +++++---
 devel/libdockapp/Makefile           | 6 +++---
 devel/startup-notification/Makefile | 6 +++---
 graphics/imlib2/Makefile            | 5 +++--
 graphics/libwmf/Makefile            | 6 +++---
 print/teTeX/base/Makefile           | 6 +++---
 x11/blackbox/Makefile               | 7 ++++---
 x11/dbus/Makefile                   | 5 +++--
 x11/windowmaker/Makefile            | 7 ++++---
 x11/xosd/Makefile                   | 6 +++---
 10 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/devel/fox/Makefile b/devel/fox/Makefile
index dc04f1f7f2e..a9b29908730 100644
--- a/devel/fox/Makefile
+++ b/devel/fox/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/02/27 10:46:00 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=	'C++ toolkit for GUI'
 CATEGORIES=	devel
 
 DISTNAME=	fox-1.6.21
-PKGNAME=${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 SHARED_LIBS +=	FOX-1.6              0.0      # .0.21
 SHARED_LIBS +=	CHART-1.6            0.0      # .0.21
 MASTER_SITES=	${HOMEPAGE}/ftp/
@@ -35,5 +35,7 @@ USE_X11=	Yes
 FOX=		fox-1.6
 SUBST_VARS=	FOX
 
-WANTLIB=	GL GLU X11 Xext Xcursor Xrandr c m stdc++ z pthread
+WANTLIB=	GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xrender Xrandr c m \
+		stdc++ z pthread
+
 .include <bsd.port.mk>
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 320c148a14b..fb8e150f7be 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2006/10/28 11:19:21 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=		'dockapp-making standard library for Window Maker'
 
 DISTNAME=		libdockapp-0.4.0
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS +=	dockapp              1.0      # .1.0
 CATEGORIES=		devel
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		Xext Xpm
+WANTLIB=		X11 Xau Xdmcp Xext Xpm
 
 MASTER_SITES=		ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/devel/startup-notification/Makefile b/devel/startup-notification/Makefile
index 81fb5485475..7a95e3747f5 100644
--- a/devel/startup-notification/Makefile
+++ b/devel/startup-notification/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2006/05/13 16:19:36 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=		"library for tracking application startup"
 
 DISTNAME=		startup-notification-0.8
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		devel x11 x11/gnome
 
 SHARED_LIBS=		startup-notification-1	0.0
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11
+WANTLIB=		ICE SM X11 Xau Xdmcp
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/startup-notification/0.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 84f67314409..1b9446a3a22 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2006/12/16 12:22:33 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=	"image manipulation library"
 
 DISTNAME=	imlib2-1.3.0
+PKGNAME=	${DISTNAME}p0
 SHARED_LIBS=	Imlib2	4.0	# .4.0
 CATEGORIES=	graphics
 
@@ -13,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c freetype m z
+WANTLIB=		X11 Xau Xdmcp Xext c freetype m z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index bd6d3d05300..b9761b2bfba 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2006/08/12 15:58:43 bernd Exp $
+# $OpenBSD: Makefile,v 1.14 2007/04/08 16:33:42 sturm Exp $
 
 COMMENT=	"WMF handling and conversion library"
 
 DISTNAME=	libwmf-0.2.8.3
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 SHARED_LIBS=	wmf		8.0	\
 		wmf-0.2		8.0	\
 		wmflite		7.1	\
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 c freetype m z
+WANTLIB=		ICE SM X11 Xau Xdmcp c freetype m z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff --git a/print/teTeX/base/Makefile b/print/teTeX/base/Makefile
index 1b359526a53..95453eb9fbe 100644
--- a/print/teTeX/base/Makefile
+++ b/print/teTeX/base/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.45 2007/04/01 21:37:49 steven Exp $
+# $OpenBSD: Makefile,v 1.46 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT-main=	"TeX distribution, executables"
 COMMENT-fmt=	"format files"
 
 VERSION=	3.0
 DISTNAME=	tetex-base-${VERSION}
-PKGNAME-main=	teTeX_base-${VERSION}p8
+PKGNAME-main=	teTeX_base-${VERSION}p9
 FULLPKGNAME-fmt=teTeX_base-fmt-${VERSION}p0
 CATEGORIES=	print
 
@@ -57,7 +57,7 @@ USE_X11=	Yes
 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-shared
 LIB_DEPENDS-main+=	t1.>=4::devel/t1lib
-WANTLIB-main+=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt
+WANTLIB-main+=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xp Xpm Xt
 RUN_DEPENDS-main+=	:ghostscript-*:print/ghostscript/gnu
 .endif
 
diff --git a/x11/blackbox/Makefile b/x11/blackbox/Makefile
index 9ac3f7ddf7b..baa620baf70 100644
--- a/x11/blackbox/Makefile
+++ b/x11/blackbox/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2007/04/01 05:58:43 steven Exp $
+# $OpenBSD: Makefile,v 1.43 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=	"small & pretty window manager for 8 and more bits displays"
 
 DISTNAME=		blackbox-0.70.1
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		x11
 
 HOMEPAGE=		http://blackboxwm.sourceforge.net/
@@ -15,7 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xft Xrender c m fontconfig freetype stdc++
+WANTLIB=		X11 Xau Xdmcp Xext Xft Xrender c expat m fontconfig \
+			freetype stdc++ z
 
 MODULES=		converters/libiconv
 
diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 3fe691dc068..07802f03fbe 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2007/03/21 00:21:58 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=		"message system"
 
 DISTNAME=		dbus-1.0.2
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS +=  dbus-1               6.0      # .5.0
 CATEGORIES=		x11
 
@@ -13,7 +14,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-WANTLIB=		ICE X11 SM c pthread
+WANTLIB=		ICE X11 Xau Xdmcp SM c pthread
 
 MASTER_SITES=		${HOMEPAGE}releases/dbus/
 
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index fcfdda59ccf..7a7426a94d7 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.69 2006/11/21 22:07:07 espie Exp $
+# $OpenBSD: Makefile,v 1.70 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT-main=		'window manager that emulates NEXTSTEP(tm)'
 COMMENT-lang=		"language subpackage for Window Maker"
 
 V=			0.92.0
 DISTNAME=		WindowMaker-${V}
-PKGNAME-main=		${DISTNAME:L}p4
+PKGNAME-main=		${DISTNAME:L}p5
 FULLPKGNAME-lang=       windowmaker-lang-${V}p1
 SHARED_LIBS=		wraster 5.0
 CATEGORIES=		x11 x11/windowmaker
@@ -44,7 +44,8 @@ LIB_DEPENDS=		jpeg.>=62::graphics/jpeg \
 			tiff.>=35::graphics/tiff \
 			png.>=2::graphics/png \
 			ungif.>=5::graphics/libungif
-WANTLIB=		X11 Xext Xft Xinerama Xpm Xrender c fontconfig freetype m z
+WANTLIB=		X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrender c expat \
+			fontconfig freetype m z
 
 RUN_DEPENDS-lang=	:windowmaker->=0.90.0:x11/windowmaker
 LIB_DEPENDS-lang=
diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 8434d75a292..5ad4522def8 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2006/10/20 22:52:23 pedro Exp $
+# $OpenBSD: Makefile,v 1.7 2007/04/08 16:33:41 sturm Exp $
 
 COMMENT=	"displays text on your screen"
 
 DISTNAME=	xosd-2.2.12
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS=	xosd 4.12
 CATEGORIES=	x11 graphics
 HOMEPAGE=	http://www.ignavus.net/software.html
@@ -15,7 +15,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 
+WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xinerama Xt c pthread 
 
 MASTER_SITES=	http://www.ignavus.net/