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.

10 files changed, 59 insertions, 23 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 838b808f75d..eebc4dc777c 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/23 04:26:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:04 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -38,4 +38,5 @@ post-install:
 
 .include "../../devel/readline/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index d3c5ef60171..328c450c426 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/08/23 04:26:51 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 22:41:05 jlam Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 Size (felt-3.05.src.tar.gz) = 956901 bytes
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
+SHA1 (patch-aa) = d04579e0f1801341391a551ae797358089cff91a
 SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 226d81ab97d..60d5024d3b3 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:05 jlam Exp $
 
 --- etc/Makefile.conf.orig	Sat Mar  4 20:37:06 2000
 +++ etc/Makefile.conf	Tue May 22 12:21:18 2001
@@ -42,5 +42,5 @@ $NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $
 -X11INC		= /usr/X11R6/include
 -X11LIB		= /usr/X11R6/lib
 +X11DEF		= ${PREFIX}/lib/X11/app-defaults
-+X11INC		= ${X11BASE}/include
-+X11LIB		= ${X11BASE}/lib
++X11INC		= ${BUILDLINK_X11_DIR}/include
++X11LIB		= ${BUILDLINK_X11_DIR}/lib
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 78965072a30..a80897153fe 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/22 02:16:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:05 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-13
@@ -19,10 +19,9 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-debug
 LIBS+=			${LIBGETOPT}
 
-USE_X11=		YES
-#USE_CURSES=		YES
 USE_BUILDLINK_ONLY=	YES
 
 .include "../../devel/libgetopt/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 70dc6f10a49..5f72118daa2 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/26 20:10:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:05 jlam Exp $
 
 DISTNAME=		qcad-1.4.7-src
 PKGNAME=		qcad-1.4.7
@@ -10,7 +10,6 @@ HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
 USE_BUILDLINK_ONLY=	# defined
-USE_X11=		# defined
 
 do-configure:
 	@for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp	\
@@ -35,4 +34,5 @@ do-install:
 	(cd ${PREFIX}/share/qcad; ${GTAR} vxf - )
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 33b65b20efa..e34cbf78dba 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 20:10:23 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:05 jlam Exp $
 
 SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48
 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes
-SHA1 (patch-aa) = f066d56f80c1875a1d792fce677f06560f1af507
+SHA1 (patch-aa) = 46d4350760f96e4da7854a48d81d0d69d9776436
 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7
 SHA1 (patch-ac) = 4e0dc2d55c9f3cb5a612c60699772bee0d9c82f0
 SHA1 (patch-ad) = 0961a104cfa006e5c08682aa45f08e1206f41308
diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 56b85db8817..c1f40d6a4fe 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $
 
 --- Makefile.orig	Sun Mar 25 06:17:10 2001
 +++ Makefile
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $
 -MOC	=	moc
 +LINK	=	$(CXX)
 +LFLAGS	=	${LDFLAGS}
-+LIBS	=	-L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
++LIBS	=	-L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
 +MOC	=	$(QTDIR)/bin/moc
  
  ####### Files
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index b777128a43a..07286bf35b8 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/06/26 20:26:16 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/08/29 22:41:06 jlam Exp $
 #
 
 DISTNAME=	vipec-2.0.4
@@ -12,7 +12,6 @@ COMMENT=	Network analyser for electrical networks
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_X11=		yes
 USE_BUILDLINK_ONLY=	yes
 
 CONFIGURE_ARGS+=	--with-qt-dir=${BUILDLINK_QTDIR}
@@ -36,4 +35,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index 14572d27839..f84cc02f609 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 20:26:16 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:06 jlam Exp $
 
 SHA1 (vipec-2.0.4.tar.gz) = 56e273d50fb9886fc25b91eb446da4812032508e
 Size (vipec-2.0.4.tar.gz) = 408479 bytes
-SHA1 (patch-aa) = 0e1640fc310770b49a91a3f1f15012102730d0d9
+SHA1 (patch-aa) = 78ae035d59c4a1e674fb5f9a99be8be680ce089a
 SHA1 (patch-ab) = 3a6b0783950fae7aa79ff4f913a719ce26a70d81
 SHA1 (patch-ac) = e4ab38a8b41e9dfa83881f8b7fd50c01b76103ac
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 585ef0a6285..f7f42a1b8e3 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,18 +1,54 @@
-$NetBSD: patch-aa,v 1.8 2001/06/26 20:26:16 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2001/08/29 22:41:06 jlam Exp $
 
 --- configure.orig	Mon May 22 14:34:07 2000
-+++ configure	Wed Aug 30 10:53:54 2000
-@@ -4408,5 +4408,5 @@
++++ configure
+@@ -3970,12 +3970,12 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   # One or both of the vars are not set, and there is no cached value.
+-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
++if test "${x_includes+set}" != set || test "$x_includes" = NONE; then
+    kde_x_includes=NO
+ else
+    kde_x_includes=$x_includes
+ fi
+-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
++if test "${x_libraries+set}" != set || test "$x_libraries" = NONE; then
+    kde_x_libraries=NO
+ else
+    kde_x_libraries=$x_libraries
+@@ -4132,6 +4132,8 @@
+ rm -f conftest*
+ fi # $ac_x_libraries = NO
+ 
++# Don't second-guess the package builder.
++if false; then
+ rm -fr conftestdir
+ if mkdir conftestdir; then
+   cd conftestdir
+@@ -4165,6 +4167,7 @@
+   cd ..
+   rm -fr conftestdir
+ fi
++fi
+ 
+ if test -z "$ac_x_includes"; then
+ ac_x_includes="."
+@@ -4407,7 +4410,7 @@
+ echo $ac_n "checking for Qt""... $ac_c" 1>&6
  echo "configure:4409: checking for Qt" >&5
  
 -LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
 +LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
  ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
  qt_libraries=""
-@@ -4631,5 +4631,5 @@
+ qt_includes=""
+@@ -4630,7 +4633,7 @@
+ 
  CXXFLAGS="$CXXFLAGS -I$qt_includes"
  LDFLAGS="$X_LDFLAGS"
 -LIBS="-lqt -lXext -lX11 $LIBSOCKET"
 +LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
  LD_LIBRARY_PATH=
  export LD_LIBRARY_PATH
+ LIBRARY_PATH=