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, 65 insertions, 40 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 14f35a50e95..92946b66435 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/08/15 08:38:33 skrll Exp $
+# $NetBSD: Makefile,v 1.39 2002/08/25 18:40:35 jlam Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	2
@@ -7,14 +7,14 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 .include "../../x11/kde2/Makefile.kde2"
 
-BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.8
+BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.8
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
 BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
 
-CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 
 .if (${MACHINE_ARCH} == "arm32")
 BROKEN=		Compilation causes arm32 machines to hang
@@ -28,22 +28,9 @@ LIBS+=			-Wl,--export-dynamic
 
 GCC_VERSION!=		gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha)
-.include "../../lang/gcc/Makefile.gcc"
+.  include "../../lang/gcc/Makefile.gcc"
 .endif
 
-# Override KDE_INCLUDES and QT_INCLUDES at build-time since their values
-# are used by reference within the kdelibs2 Makefiles
-#
-MAKE_FLAGS+=		KDE_INCLUDES="-I${BUILDLINK_DIR}/include"
-MAKE_FLAGS+=		QT_INCLUDES="-I${BUILDLINK_QTDIR}/include"
-
-# The configure script looks for xml2-config in the environment as
-# ${XML_CONFIG}, not as ${XML2_CONFIG} like it's supposed to.
-#
-CONFIGURE_ENV+=		XML_CONFIG="${XML2_CONFIG}"
-KDEDIR=			${PREFIX}
-BUILDLINK_KDEDIR=	${BUILDLINK_DIR}
-
 REPLACE_PERL= \
 	${WRKSRC}/kio/proxytype.pl \
 	${WRKSRC}/kio/useragent.pl
@@ -52,7 +39,7 @@ PLIST_SRC=		${WRKDIR}/PLIST
 UNLIMIT_RESOURCES=	datasize
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink.mk"
+.  include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
 
 PLIST_SUBST+=		CUPS=
@@ -106,27 +93,29 @@ post-install:
 	  ${ECHO} "@dirrm share/kde";					\
 	) > ${PLIST_SRC}
 
-.include "../../archivers/bzip2/buildlink.mk"
-.include "../../audio/libaudiofile/buildlink.mk"
-.include "../../devel/pcre/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../textproc/libxslt/buildlink.mk"
-.include "../../x11/kde2/buildlink.mk"
-.include "../../x11/qt2-libs/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../textproc/libxslt/buildlink2.mk"
+.include "../../x11/kde2/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
 
 # XXX On NetBSD, the egcs and gcc-2.95.3 for:
 # XXX
 # XXX     alpha
 # XXX
-# XXX has an optimization bug when compiling with -O2 that is tickled by
-# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp.
-# XXX ${WRKSRC}/kdecore/kwinmodule.cpp
+# XXX have an optimization bug when compiling with -O2 that is tickled by:
+# XXX
+# XXX	${WRKSRC}/kdeprint/management/kmiconview.cpp
+# XXX	${WRKSRC}/kdecore/kwinmodule.cpp
+#
 .if ${OPSYS} == "NetBSD"
 .  if (${MACHINE_ARCH} == "alpha")
 CXXFLAGS:=	${CXXFLAGS:C/-O[0-9]*//g}
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 0a7a4a75177..6c970f5d327 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.21 2002/08/15 08:48:08 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.22 2002/08/25 18:40:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
new file mode 100644
index 00000000000..28c6bb286fe
--- /dev/null
+++ b/x11/kdelibs2/buildlink2.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:36 jlam Exp $
+
+.if !defined(KDELIBS2_BUILDLINK2_MK)
+KDELIBS2_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_PACKAGES+=		kdelibs2
+BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb2
+BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
+BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.kdelibs2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/PLIST
+
+KDEDIR=				${BUILDLINK_PREFIX.kdelibs2}
+
+BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
+USE_OPENSSL_VERSION=		${OPENSSL_VERSION_096}
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
+.include "../../print/cups/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	kdelibs2-buildlink
+
+kdelibs2-buildlink: _BUILDLINK_USE
+
+.endif	# KDELIBS2_BUILDLINK2_MK
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 4672e7b5b2d..74ee881ce9d 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2002/08/16 12:21:53 tron Exp $
+$NetBSD: distinfo,v 1.20 2002/08/25 18:40:36 jlam Exp $
 
 SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c
 Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes
diff --git a/x11/kdelibs2/patches/patch-bt b/x11/kdelibs2/patches/patch-bt
index a764b508680..c6e4cc777ab 100644
--- a/x11/kdelibs2/patches/patch-bt
+++ b/x11/kdelibs2/patches/patch-bt
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.2 2002/08/15 08:38:34 skrll Exp $
+$NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $
 
 --- kssl/kopenssl.cc.orig	Wed Sep  5 00:08:18 2001
 +++ kssl/kopenssl.cc
diff --git a/x11/kdelibs2/patches/patch-bw b/x11/kdelibs2/patches/patch-bw
index 91ef000444c..a35e06e119f 100644
--- a/x11/kdelibs2/patches/patch-bw
+++ b/x11/kdelibs2/patches/patch-bw
@@ -1,4 +1,4 @@
-$NetBSD: patch-bw,v 1.2 2002/08/15 08:38:34 skrll Exp $
+$NetBSD: patch-bw,v 1.3 2002/08/25 18:40:37 jlam Exp $
 
 --- kssl/ksslcertificate.cc.orig	Thu Aug 15 09:25:29 2002
 +++ kssl/ksslcertificate.cc
diff --git a/x11/kdelibs2/patches/patch-by b/x11/kdelibs2/patches/patch-by
index fc074b8100d..ac5ffa28dcf 100644
--- a/x11/kdelibs2/patches/patch-by
+++ b/x11/kdelibs2/patches/patch-by
@@ -1,4 +1,4 @@
-$NetBSD: patch-by,v 1.1 2002/08/15 08:38:34 skrll Exp $
+$NetBSD: patch-by,v 1.2 2002/08/25 18:40:37 jlam Exp $
 
 --- kssl/kopenssl.h.orig	Sun Jul 29 05:55:41 2001
 +++ kssl/kopenssl.h
diff --git a/x11/kdelibs2/patches/patch-bz b/x11/kdelibs2/patches/patch-bz
index 8b7254a47ec..8767779b41c 100644
--- a/x11/kdelibs2/patches/patch-bz
+++ b/x11/kdelibs2/patches/patch-bz
@@ -1,4 +1,4 @@
-$NetBSD: patch-bz,v 1.1 2002/08/16 12:21:53 tron Exp $
+$NetBSD: patch-bz,v 1.2 2002/08/25 18:40:37 jlam Exp $
 
 --- kdesu/kdesu_pty.cpp.orig	Wed Apr 11 18:48:56 2001
 +++ kdesu/kdesu_pty.cpp	Fri Aug 16 14:19:18 2002