Update WANTLIB/LIB_DEPENDS_CHECK for Xdmcp and other fixes

10 files changed, 14 insertions, 24 deletions

diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index e0cc214..6e3fcc1 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -13,8 +13,6 @@ SHARED_LIBS=    ICE 11.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		
-
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
 # Dependencies
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index c385d7b..a9ef075 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -13,15 +13,14 @@ SHARED_LIBS=    X11 17.0 X11-xcb 2.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		Xau xcb
+WANTLIB =		Xau Xdmcp xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
 BUILD_DEPENDS =		x11/xtrans \
 			devel/xorgproto
 
-LIB_DEPENDS =		x11/libxcb \
-			x11/libXau
+LIB_DEPENDS =		x11/libxcb
 
 SEPARATE_BUILD =	Yes
 USE_GMAKE =		Yes
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index d504887..81f4727 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xaw7 15.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		Xt ICE SM Xau Xext Xmu Xpm X11 xcb
+WANTLIB =		Xt ICE SM X11 Xau Xdmcp Xext Xmu Xpm X11 xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
@@ -21,9 +21,7 @@ MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 BUILD_DEPENDS =		devel/xorg-util-macros \
 			devel/xorgproto
 
-LIB_DEPENDS =		x11/libX11 \
-			x11/libXmu \
-			x11/libXt \
+LIB_DEPENDS =		x11/libXmu \
 			x11/libXpm
 
 SEPARATE_BUILD =	Yes
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 04c2479..9795308 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xext 13.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		X11 Xau xcb
+WANTLIB =		X11 Xau Xdmcp xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
@@ -22,7 +22,6 @@ BUILD_DEPENDS =		devel/xorg-util-macros \
 			devel/xorgproto
 
 LIB_DEPENDS =		x11/libxcb \
-			x11/libXau \
 			x11/libX11
 
 SEPARATE_BUILD =	Yes
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index ed1e975..2aa3d13 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xfixes 6.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		X11 Xau xcb
+WANTLIB =		X11 Xau Xdmcp xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index b7f168a..8c7a02d 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xft 12.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		Xrender X11 Xau expat fontconfig freetype \
+WANTLIB =		Xrender X11 Xau Xdmcp expat fontconfig freetype \
 			iconv intl pthread uuid xcb z
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index 33a536b..fa407c0 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xmu 11.0 Xmuu 6.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		Xt SM ICE Xext X11 xcb Xau
+WANTLIB =		SM ICE X11 Xau Xdmcp Xext Xt xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
@@ -23,8 +23,7 @@ BUILD_DEPENDS =		devel/xorg-util-macros \
 			x11/xtrans
 
 LIB_DEPENDS =		x11/libXt \
-			x11/libXext \
-			x11/libX11
+			x11/libXext
 
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index c8bbc2e..752b3aa 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xpm 9.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		ICE SM Xext Xt X11 xcb Xau c
+WANTLIB =		ICE SM X11 Xau Xdmcp Xext Xt xcb c
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
@@ -22,10 +22,9 @@ BUILD_DEPENDS =		devel/xorg-util-macros \
 			devel/xorgproto \
 			x11/xtrans
 
-LIB_DEPENDS =		x11/libXt \
+LIB_DEPENDS =		x11/libX11 \
 			x11/libXext \
-			x11/libX11 \
-			x11/libXau
+			x11/libXt
 
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index c2a0ed3..0c5ee2f 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xrender 6.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		X11 Xau xcb
+WANTLIB =		X11 Xau Xdmcp xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 1cff1e2..b9ebb53 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -13,7 +13,7 @@ SHARED_LIBS=    Xt 11.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		ICE SM Xau X11 xcb
+WANTLIB =		ICE SM X11 Xau Xdmcp xcb
 
 MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
 
@@ -22,8 +22,6 @@ BUILD_DEPENDS =		devel/xorg-util-macros \
 			devel/xorgproto
 
 LIB_DEPENDS =		x11/libSM \
-			x11/libICE \
-			x11/libXau \
 			x11/libX11
 
 SEPARATE_BUILD =	Yes