[pkgsrc/trunk]: pkgsrc Make KDE depend on at least version 3.3.3nb1 of qt3-libs.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/173f3330ed3a
branches:  trunk
changeset: 480664:173f3330ed3a
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Sep 19 04:17:22 2004 +0000

description:
Make KDE depend on at least version 3.3.3nb1 of qt3-libs.

diffstat:

 audio/arts/Makefile    |  3 ++-
 meta-pkgs/kde3/kde3.mk |  9 +++++++--
 x11/kdelibs3/Makefile  |  3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r aff8406cba48 -r 173f3330ed3a audio/arts/Makefile
--- a/audio/arts/Makefile       Sun Sep 19 04:10:58 2004 +0000
+++ b/audio/arts/Makefile       Sun Sep 19 04:17:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/08/21 11:52:21 markd Exp $
+# $NetBSD: Makefile,v 1.34 2004/09/19 04:17:22 markd Exp $
 
 DISTNAME=      arts-1.3.0
 CATEGORIES=    audio
@@ -15,6 +15,7 @@
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}
 
+_IN_ARTS_BUILD=                yes
 .include "../../meta-pkgs/kde3/kde3.mk"
 
 .include "../../audio/esound/buildlink3.mk"
diff -r aff8406cba48 -r 173f3330ed3a meta-pkgs/kde3/kde3.mk
--- a/meta-pkgs/kde3/kde3.mk    Sun Sep 19 04:10:58 2004 +0000
+++ b/meta-pkgs/kde3/kde3.mk    Sun Sep 19 04:17:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.2 2004/07/05 12:26:01 markd Exp $
+# $NetBSD: kde3.mk,v 1.3 2004/09/19 04:17:22 markd Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -87,8 +87,13 @@
 CONFIGURE_ENV+=                xdg_appsdir="${KDEDIR}/share/applications/kde"
 CONFIGURE_ENV+=                xdg_directorydir="${KDEDIR}/share/desktop-directories"
 
+_IN_ARTS_BUILD?=       no
+.if !empty(_IN_ARTS_BUILD:M[nN][oO])
+BUILDLINK_DEPENDS.qt3-libs+=   qt3-libs>=3.3.3nb1
+.include "../../x11/qt3-libs/buildlink3.mk"
+.endif
+
 BUILDLINK_DEPMETHOD.qt3-tools= build
-
 .include "../../x11/qt3-tools/buildlink3.mk"
 
 .endif # KDE3_MK
diff -r aff8406cba48 -r 173f3330ed3a x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Sun Sep 19 04:10:58 2004 +0000
+++ b/x11/kdelibs3/Makefile     Sun Sep 19 04:17:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2004/09/06 13:08:54 markd Exp $
+# $NetBSD: Makefile,v 1.67 2004/09/19 04:17:22 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
 PKGREVISION=   1
@@ -118,7 +118,6 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"