Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

6 files changed, 69 insertions, 38 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 26e206fb083..84f80f8c794 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.17 2002/03/13 17:38:02 fredb Exp $
-#
-#USE_MESA=		yes
+# $NetBSD: Makefile,v 1.18 2002/08/25 18:40:42 jlam Exp $
 
-.include "../qt2-libs/Makefile.common"
+PKGNAME=	qt2-libs-${QTVERSION}
+PKGREVISION=	2
+COMMENT=	C++ X GUI toolkit
+
+USE_BUILDLINK2=	yes
 
-PKGNAME=		qt2-libs-${QTVERSION}
-PKGREVISION=		2
-COMMENT=		C++ X GUI toolkit
+.include "../qt2-libs/Makefile.common"
 
-USE_BUILDLINK_ONLY=	yes
-CONFIGURE_ARGS+=	-I${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	-L${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CONFIGURE_ARGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 CONFIGURE_ENV+=		QTDIR="${WRKSRC}"
 MAKE_ENV+=		QTDIR="${WRKSRC}"
@@ -22,14 +21,14 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
 	${INSTALL_DATA_DIR} ${QTPREFIX}/lib
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib
+	${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../graphics/mng/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/mng/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 4d293c76496..5d7483cda2d 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.17 2001/10/09 19:51:41 tron Exp $
+# $NetBSD: Makefile.common,v 1.18 2002/08/25 18:40:43 jlam Exp $
 #
 
-DISTNAME=		qt-x11-${QTVERSION}
-WRKSRC=			${WRKDIR}/qt-${QTVERSION}
-CATEGORIES=		x11
-MASTER_SITES=	\
-	ftp://ftp.trolltech.com/qt/source/ \
-	ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
+DISTNAME=	qt-x11-${QTVERSION}
+WRKSRC=		${WRKDIR}/qt-${QTVERSION}
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
+		ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
 
 .include "../qt2/Makefile.common"
 
@@ -38,7 +37,7 @@ PATCHDIR=		${.CURDIR}/../../x11/qt2-libs/patches
 
 .if ${OPSYS} == "SunOS"
 BUILD_DEPENDS+=		egcs-1.1.2:../../lang/egcs
-CONFIGURE_ENV+=		CXX=${LOCALBASE}/egcs/bin/g++
+CXX=			${LOCALBASE}/egcs/bin/g++
 CONFIGURE_ARGS+=	-platform solaris-g++
 .endif
 
diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk
new file mode 100644
index 00000000000..9b4c199532e
--- /dev/null
+++ b/x11/qt2-libs/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:43 jlam Exp $
+
+.if !defined(QT2_LIBS_BUILDLINK2_MK)
+QT2_LIBS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		qt2-libs
+BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.3.1nb2
+BUILDLINK_PKGSRCDIR.qt2-libs?=	../../x11/qt2-libs
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.qt2-libs=qt2-libs
+BUILDLINK_PREFIX.qt2-libs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.qt2-libs+=	qt2/include/*.h
+BUILDLINK_FILES.qt2-libs+=	qt2/lib/libqt.*
+
+QTDIR=		${BUILDLINK_PREFIX.qt2-libs}/qt2
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/mng/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+
+CONFIGURE_ENV+=		QTDIR="${QTDIR}"
+CONFIGURE_ENV+=		MOC="${QTDIR}/bin/moc"
+MAKE_ENV+=		QTDIR="${QTDIR}"
+MAKE_ENV+=		MOC="${QTDIR}/bin/moc"
+LDFLAGS+=		-Wl,-R${QTDIR}/lib
+
+BUILDLINK_TARGETS+=	qt2-libs-buildlink
+
+qt2-libs-buildlink: _BUILDLINK_USE
+
+.endif	# QT2_LIBS_BUILDLINK2_MK
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index f25c1e6cdcb..76d2db8cb34 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2001/11/16 09:08:05 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:40:43 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) = 29254fdd872f763fb48512cbf982481b88e40e5b
-SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415
+SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794
+SHA1 (patch-ac) = c94b7b93e991f89fbfe6b3e0e142d825c7e16eac
 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 e0f433c5120..fc467d58e57 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2002/08/25 18:40:44 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.7 2001/08/29 22:41:30 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
++SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@LOCALBASE@/include -I@X11BASE@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
++SYSCONF_LFLAGS_X11	= -L@X11BASE@/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.7 2001/08/29 22:41:30 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@LOCALBASE@/lib -L@X11BASE@/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 4ad0ebf9062..406bb05f400 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 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.4 2001/08/29 22:41:30 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
-+SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
++SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= 
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@LOCALBASE@/include -I@X11BASE@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
-+SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
++SYSCONF_LFLAGS_X11	= -L@X11BASE@/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.4 2001/08/29 22:41:30 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= 
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@LOCALBASE@/lib -L@X11BASE@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	=