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.

3 files changed, 44 insertions, 8 deletions

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=