diff options
| -rw-r--r-- | audio/arts/Makefile | 3 | ||||
| -rw-r--r-- | meta-pkgs/kde3/kde3.mk | 9 | ||||
| -rw-r--r-- | x11/kdelibs3/Makefile | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile index 3f5f115c7c1..2adfc25a14d 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -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 @@ USE_PERL5= build # 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 --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk index bc3f23dfae9..43080c1786f 100644 --- a/meta-pkgs/kde3/kde3.mk +++ b/meta-pkgs/kde3/kde3.mk @@ -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+= kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers" CONFIGURE_ENV+= xdg_appsdir="${KDEDIR}/share/applications/kde" CONFIGURE_ENV+= xdg_directorydir="${KDEDIR}/share/desktop-directories" -BUILDLINK_DEPMETHOD.qt3-tools= build +_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 --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c8a5f5c0efc..be43efd97a5 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -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 @@ GCC_REQD+= 2.95 .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" |