Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references

to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.

5 files changed, 17 insertions, 15 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 9e8b0832ad3..fd7308a0f51 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/23 19:35:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:29 jlam Exp $
 #
 #USE_MESA=		yes
 
@@ -30,4 +30,5 @@ do-install:
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/mng/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 15af1ef9ce8..a1e18ed2f59 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2001/06/23 19:35:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2001/08/29 22:41:29 jlam Exp $
 #
 
 DISTNAME=		qt-x11-${QTVERSION}
@@ -43,6 +43,7 @@ CONFIGURE_ARGS+=	-platform solaris-g++
 .endif
 
 FILES_SUBST=		BUILDLINK_DIR=${BUILDLINK_DIR}
+FILES_SUBST+=		BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR}
 FILES_SUBST+=		LOCALBASE=${LOCALBASE}
 FILES_SUBST+=		QTDIR=${QTPREFIX}
 FILES_SUBST+=		X11BASE=${X11BASE}
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index 5c212303bf1..7885500ad92 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:29 jlam Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
 SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
-SHA1 (patch-ab) = 7f1cdc853e036f17fee51402756f68504c413d00
-SHA1 (patch-ac) = 25cbb7d243dc2c543b44d2870325d017b26604b0
+SHA1 (patch-ab) = 29254fdd872f763fb48512cbf982481b88e40e5b
+SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415
 SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
 SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index 8992d2de3a6..e0f433c5120 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $
 
 --- configs/netbsd-g++-static.in.orig	Wed Jun 13 04:56:48 2001
 +++ configs/netbsd-g++-static.in
@@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
++SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
++SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
index 1e230e7010b..4ad0ebf9062 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $
 
 --- configs/solaris-g++-static.in.orig	Wed Jun 13 04:56:50 2001
 +++ configs/solaris-g++-static.in
@@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
-+SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
++SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= 
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
-+SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
++SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm -lresolv -lsocket -lnsl
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= 
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	=