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.

8 files changed, 67 insertions, 34 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 892a3f38dc3..df0ac57fbd6 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/08 16:17:08 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 18:40:44 jlam Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -7,8 +7,7 @@ PKGNAME=		qt3-libs-${QTVERSION}
 PKGREVISION=		2
 COMMENT=		C++ X GUI toolkit
 
-USE_BUILDLINK_ONLY=	yes
-BUILDLINK_QTDIR=	${WRKSRC}
+USE_BUILDLINK2=		yes
 
 MAKE_ENV+=		LIBQT="${WRKSRC}/lib/libqt-mt.la"
 
@@ -26,7 +25,7 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
 	${INSTALL_DATA_DIR} ${QTPREFIX}/lib
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib
+	${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include/private
@@ -36,12 +35,12 @@ do-install:
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${QTPREFIX}/plugins/imageformats
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats
 
-.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 "../../graphics/freetype2/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/mng/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index fb69f91ff8f..87a405334a7 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2002/05/29 19:09:55 skrll Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/08/25 18:40:44 jlam Exp $
 #
-DISTNAME=               qt-x11-free-${QTVERSION}
-CATEGORIES=             x11
-MASTER_SITES=   \
-	ftp://ftp.trolltech.com/qt/source/ \
-	ftp://ftp.bero.org/pub/qt/source/
+DISTNAME=		qt-x11-free-${QTVERSION}
+CATEGORIES=		x11
+MASTER_SITES=		ftp://ftp.trolltech.com/qt/source/ \
+			ftp://ftp.bero.org/pub/qt/source/
 
 .include "../qt3/Makefile.common"
 
@@ -40,12 +39,15 @@ PATCHDIR=		${.CURDIR}/../../x11/qt3-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
 
 post-patch:
 	${SED} \
+		-e 's:@LOCALBASE@:${LOCALBASE}:g' \
+		-e 's:@X11BASE@:${X11BASE}:g' \
+		-e 's:@X11PREFIX@:${X11PREFIX}:g' \
 		-e 's:@CC@:${CC}:g' \
 		-e 's:@CXX@:${CXX}:g' \
 		-e 's:@LDFLAGS@:${LDFLAGS}:g' \
@@ -53,9 +55,7 @@ post-patch:
 		-e 's:@CXXFLAGS@:${CXXFLAGS}:g' \
 		-e 's:@LEX@:${LEX}:g' \
 		-e 's:@YACC@:${YACC}:g' \
-		-e 's:@LIBTOOL@:${LIBTOOL}:g' \
-		-e 's:@BUILDLINK_DIR@:${BUILDLINK_DIR}:g' \
-		-e 's:@BUILDLINK_X11_DIR@:${BUILDLINK_X11_DIR}:g' \
+		-e 's:@LIBTOOL@:${PKGLIBTOOL}:g' \
 		${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
 	for dir in ${WRKSRC}/mkspecs/*; do \
 		${CP} ${WRKSRC}/qmake.conf $${dir}; \
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 340b89691ed..d21cbf55150 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/05/29 19:09:55 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:45 jlam Exp $
 qt3/bin/moc
 qt3/include/jri.h
 qt3/include/jri_md.h
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
new file mode 100644
index 00000000000..1b8441de487
--- /dev/null
+++ b/x11/qt3-libs/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD
+
+.if !defined(QT3_LIBS_BUILDLINK2_MK)
+QT3_LIBS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		qt3-libs
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.4nb2
+BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
+BUILDLINK_PREFIX.qt3-libs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.qt3-libs+=	qt3/include/*.h
+BUILDLINK_FILES.qt3-libs+=	qt3/include/private/*.h
+BUILDLINK_FILES.qt3-libs+=	qt3/lib/libqt-mt.*
+
+QTDIR=		${BUILDLINK_PREFIX.qt3-libs}/qt3
+
+.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+=	qt3-libs-buildlink
+
+qt3-libs-buildlink: _BUILDLINK_USE
+
+.endif	# QT3_LIBS_BUILDLINK2_MK
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 534207eed7d..61de67c9423 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/30 12:33:26 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:40:46 jlam Exp $
 
 SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb
 Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 0e0c274971d..edbd31989f1 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-#
-# $Id: qmake.conf,v 1.3 2002/05/30 12:33:27 skrll Exp $
+# $NetBSD: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $
+# $Id: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -32,14 +32,14 @@ QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 
-QMAKE_INCDIR		= @BUILDLINK_DIR@/include
-QMAKE_LIBDIR		= @BUILDLINK_DIR@/lib
-QMAKE_INCDIR_X11	= @BUILDLINK_X11_DIR@/include
-QMAKE_LIBDIR_X11	= @BUILDLINK_X11_DIR@/lib
+QMAKE_INCDIR		= @LOCALBASE@/include
+QMAKE_LIBDIR		= @LOCALBASE@/lib
+QMAKE_INCDIR_X11	= @X11BASE@/include
+QMAKE_LIBDIR_X11	= @X11BASE@/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL	= @BUILDLINK_DIR@/include
-QMAKE_LIBDIR_OPENGL	= @BUILDLINK_DIR@/lib
+QMAKE_INCDIR_OPENGL	= @X11PREFIX@/include
+QMAKE_LIBDIR_OPENGL	= @X11PREFIX@/lib
 
 QMAKE_LINK		= @LIBTOOL@ --mode=link @CXX@
 QMAKE_LINK_SHLIB_CMD    = \
diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa
index e52c4f01b2a..3983e6e2cab 100644
--- a/x11/qt3-libs/patches/patch-aa
+++ b/x11/qt3-libs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/05/30 12:33:27 skrll Exp $
+$NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $
 
 --- Makefile.orig	Thu May 30 09:42:36 2002
 +++ Makefile
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index c00ab0b972f..241ef83148f 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/05/29 19:09:56 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 18:40:47 jlam Exp $
 
 --- src/kernel/qthread_unix.cpp.orig	Fri May 24 16:43:12 2002
 +++ src/kernel/qthread_unix.cpp