diff options
-rw-r--r-- | games/kdegames2/Makefile | 8 | ||||
-rw-r--r-- | sysutils/koncd/Makefile | 8 | ||||
-rw-r--r-- | sysutils/rox-archive/Makefile | 4 | ||||
-rw-r--r-- | sysutils/rox-edit/Makefile | 6 | ||||
-rw-r--r-- | sysutils/rox-lib/Makefile | 6 | ||||
-rw-r--r-- | sysutils/rox-memo/Makefile | 6 | ||||
-rw-r--r-- | sysutils/rox-session/Makefile | 8 | ||||
-rw-r--r-- | sysutils/rox-system/Makefile | 10 | ||||
-rw-r--r-- | sysutils/rox-wallpaper/Makefile | 6 | ||||
-rw-r--r-- | sysutils/rox/Makefile | 8 | ||||
-rw-r--r-- | x11/kde2/kde2.mk | 84 | ||||
-rw-r--r-- | x11/kdebase2/Makefile | 12 | ||||
-rw-r--r-- | x11/kdebase2/buildlink3.mk | 22 | ||||
-rw-r--r-- | x11/kdelibs2/Makefile | 28 | ||||
-rw-r--r-- | x11/kdelibs2/buildlink3.mk | 34 | ||||
-rw-r--r-- | x11/qt2-designer-kde/Makefile | 6 |
16 files changed, 198 insertions, 58 deletions
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 905473c3ca8..6150f88e0a8 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:40 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/05/01 23:57:00 snj Exp $ DISTNAME= kdegames-2.2.2 PKGREVISION= 6 @@ -9,9 +9,9 @@ COMMENT= Games for the KDE integrated X11 desktop BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES -.include "../../x11/kde2/buildlink2.mk" -.include "../../x11/kdebase2/buildlink2.mk" +.include "../../x11/kde2/kde2.mk" +.include "../../x11/kdebase2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile index 17cfb06586f..d2df2c389e5 100644 --- a/sysutils/koncd/Makefile +++ b/sysutils/koncd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:55 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2004/05/02 00:07:33 snj Exp $ DISTNAME= koncd-0.7.1 PKGREVISION= 6 @@ -12,10 +12,10 @@ COMMENT= Frontend to the fabulous cdrecord and mkisofs programs BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde DEPENDS+= cdrecord>=1.9:../../sysutils/cdrecord -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES -.include "../../x11/kde2/buildlink2.mk" -.include "../../x11/kdebase2/buildlink2.mk" +.include "../../x11/kde2/kde2.mk" +.include "../../x11/kdebase2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile index a55e720743c..ed61678636f 100644 --- a/sysutils/rox-archive/Makefile +++ b/sysutils/rox-archive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/02 00:00:17 snj Exp $ # DISTNAME= Archive-0.1.2 @@ -18,7 +18,7 @@ DEPENDS+= rox-lib>=0.1.4nb1:../../sysutils/rox-lib WRKSRC= ${WRKDIR}/Archive DIST_SUBDIR= rox -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PERL5= yes NO_CONFIGURE= yes diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile index 558972c81a1..dd1e7ec9288 100644 --- a/sysutils/rox-edit/Makefile +++ b/sysutils/rox-edit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 00:00:17 snj Exp $ # DISTNAME= Edit-0.1.2 @@ -19,7 +19,7 @@ DIST_SUBDIR= rox NO_CONFIGURE= yes NO_BUILD= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PYTHON_PATCH_SCRIPTS= AppRun @@ -36,5 +36,5 @@ do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox .include "../../lang/python/application.mk" -.include "../../x11/pygtk/buildlink2.mk" +.include "../../x11/pygtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile index 624dc7e441c..6ebc41ec75b 100644 --- a/sysutils/rox-lib/Makefile +++ b/sysutils/rox-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:17 snj Exp $ # DISTNAME= ROX-Lib-0.1.4 @@ -19,7 +19,7 @@ DIST_SUBDIR= rox NO_CONFIGURE= yes NO_BUILD= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PYTHON_PATCH_SCRIPTS= AppRun bin/savebox @@ -37,5 +37,5 @@ do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox .include "../../lang/python/application.mk" -.include "../../x11/pygtk/buildlink2.mk" +.include "../../x11/pygtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile index a452dce98ad..dec6a2448c2 100644 --- a/sysutils/rox-memo/Makefile +++ b/sysutils/rox-memo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:17 snj Exp $ # DISTNAME= Memo-1.0.0 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/Memo NO_CONFIGURE= yes NO_BUILD= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PYTHON_PATCH_SCRIPTS= AppRun @@ -36,5 +36,5 @@ do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox .include "../../lang/python/application.mk" -.include "../../x11/pygtk/buildlink2.mk" +.include "../../x11/pygtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile index 1eed78e67d7..7b2879a7eec 100644 --- a/sysutils/rox-session/Makefile +++ b/sysutils/rox-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/05/02 00:00:17 snj Exp $ # DISTNAME= ROX-Session-0.1.14 @@ -17,7 +17,7 @@ DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src DIST_SUBDIR= rox -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_X11= yes @@ -36,6 +36,6 @@ do-install: < ${WRKDIR}/${DISTNAME}/ROX-Session/AppRun \ > ${PREFIX}/share/rox/ROX-Session/AppRun -.include "../../textproc/libxml2/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile index 6dc12250930..f9ad7a8d91a 100644 --- a/sysutils/rox-system/Makefile +++ b/sysutils/rox-system/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/02 12:18:09 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 00:00:17 snj Exp $ # DISTNAME= System-0.1.2 @@ -17,7 +17,7 @@ DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox WRKSRC= ${WRKDIR}/System/src DIST_SUBDIR= rox -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes APPDIR= ${PREFIX}/share/rox @@ -34,7 +34,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKDIR}/src/System ${PREFIX}/libexec/rox ${CP} -Rf ${WRKDIR}/System ${APPDIR} -.include "../../sysutils/libgtop/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" +.include "../../sysutils/libgtop/buildlink3.mk" +.include "../../x11/gnome-libs/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile index b3229845c1b..c65302faaa5 100644 --- a/sysutils/rox-wallpaper/Makefile +++ b/sysutils/rox-wallpaper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:18 snj Exp $ # DISTNAME= Wallpaper-0.1.1 @@ -20,7 +20,7 @@ DIST_SUBDIR= rox NO_CONFIGURE= yes NO_BUILD= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes PYTHON_PATCH_SCRIPTS= AppRun @@ -37,5 +37,5 @@ do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox .include "../../lang/python/application.mk" -.include "../../x11/pygtk/buildlink2.mk" +.include "../../x11/pygtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile index 4f93e0dd734..e3576394c15 100644 --- a/sysutils/rox/Makefile +++ b/sysutils/rox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/23 21:50:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/05/02 00:00:17 snj Exp $ # DISTNAME= rox-1.2.0 @@ -16,7 +16,7 @@ DEPENDS+= rox-base>=1.0.2nb1:../../sysutils/rox-base WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src DIST_SUBDIR= rox -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gtk2 @@ -45,6 +45,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/rox ${PREFIX}/bin ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/rox.1 ${PREFIX}/man/man1 -.include "../../textproc/libxml2/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kde2/kde2.mk b/x11/kde2/kde2.mk new file mode 100644 index 00000000000..dcfab02fcd4 --- /dev/null +++ b/x11/kde2/kde2.mk @@ -0,0 +1,84 @@ +# $NetBSD: kde2.mk,v 1.1 2004/05/01 23:57:00 snj Exp $ +# +# This Makefile fragment is included by packages that use the KDE2 +# configure-and-build process. +# +# To use this Makefile fragment, simply include this Makefile fragment in +# the package Makefile. +# +# The buildlink strategy with KDE2 packages is: +# +# * pass UIC to the configure script, as most of the KDE2 packages need +# the path to the QT2 uic to build. +# +# * pass USER_LDFLAGS to the configure script, containing the value of +# LDFLAGS as set by bsd.pkg.mk; this should pass all of the necessary +# library directory and rpath settings to the compiler/linker to find +# the X11, Qt-2.x, and KDE-2.x libraries. +# +# We pass the following values via options to the configure script: +# +# * datadir is where all of the KDE2 data files go +# * qt-dir is the location of QT2 for build purposes +# * extra-includes is where headers for dependencies may be found +# +# We _don't_ pass the following values via options to the configure script: +# +# * extra-libs contains library directories that are added to both the +# rpath via -R and to the linker flags via -L; we don't need this +# since we pass them in directly via ${USER_LDFLAGS} +# +# We also disable the rpath setting by the configure script since it often +# guesses wrong on odd setups, and since we already pass all of the required +# flags through USER_LDFLAGS. + +.if !defined(KDE2_MK) +KDE2_MK= # defined + +# All KDE2 packages satisfy the requirements for USE_X11BASE. This also +# forces all KDE2 packages to have a common installation prefix. +# +USE_X11BASE= YES + +.include "../../mk/bsd.prefs.mk" + +KDEDIR?= ${X11PREFIX} +QTDIR?= ${X11PREFIX}/qt2 + +CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde" +CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}" +CONFIGURE_ARGS+= --with-extra-includes="${_KDE2_EXTRA_INCLUDES}" +CONFIGURE_ARGS+= --disable-rpath +.if exists(${X11BASE}/lib/libXinerama.so) +CONFIGURE_ARGS+= --with-xinerama +.endif + +CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" +CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" +LDFLAGS+= -L${QTDIR}/lib + +_KDE2_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include + +KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \ + ${KDEDIR}/etc/config.site + +CONFIGURE_ENV+= KDEDIR="${KDEDIR}" +CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}" +CONFIGURE_ENV+= kde_appsdir="${KDEDIR}/share/kde/applnk" +#CONFIGURE_ENV+= kde_bindir="${KDEDIR}/bin" +CONFIGURE_ENV+= kde_cgidir="${KDEDIR}/kde-cgi-bin" +CONFIGURE_ENV+= kde_confdir="${KDEDIR}/share/kde/config" +CONFIGURE_ENV+= kde_datadir="${KDEDIR}/share/kde/apps" +CONFIGURE_ENV+= kde_htmldir="${KDEDIR}/share/doc/kde/HTML" +CONFIGURE_ENV+= kde_icondir="${KDEDIR}/share/kde/icons" +CONFIGURE_ENV+= kde_locale="${KDEDIR}/share/kde/locale" +CONFIGURE_ENV+= kde_mimedir="${KDEDIR}/share/kde/mimelnk" +#CONFIGURE_ENV+= kde_moduledir="${KDEDIR}/lib/kde2" +CONFIGURE_ENV+= kde_servicesdir="${KDEDIR}/share/kde/services" +CONFIGURE_ENV+= kde_servicetypesdir="${KDEDIR}/share/kde/servicetypes" +CONFIGURE_ENV+= kde_sounddir="${KDEDIR}/share/kde/sounds" +CONFIGURE_ENV+= kde_templatesdir="${KDEDIR}/share/kde/templates" +CONFIGURE_ENV+= kde_toolbardir="${KDEDIR}/share/kde/toolbar" +CONFIGURE_ENV+= kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers" + +.endif # KDE2_MK diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 3e6e7c19e71..19b6e5d81e6 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/03/26 02:28:01 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2004/05/01 23:57:00 snj Exp $ DISTNAME= kdebase-2.2.2 PKGREVISION= 6 @@ -13,7 +13,7 @@ BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES CONFIGURE_ARGS+= --with-ssl-dir="${SSLBASE}" \ --with-ldap=${BUILDLINK_PREFIX.openldap} \ @@ -41,7 +41,7 @@ BUILD_DEFS+= KDE2_NSPLUGINS PLIST_SRC+= ${PKGDIR}/PLIST.nsplugins CONFIGURE_ARGS+= --with-motif-includes="${MOTIFBASE}/include" \ --with-motif-libraries="${MOTIFBASE}/lib" -.include "../../mk/motif.buildlink2.mk" +.include "../../mk/motif.buildlink3.mk" .else CONFIGURE_ARGS+= --without-motif .endif @@ -120,8 +120,8 @@ post-install: ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc .endif -.include "../../databases/openldap/buildlink2.mk" -.include "../../x11/kde2/buildlink2.mk" -.include "../../x11/kdelibs2/buildlink2.mk" +.include "../../databases/openldap/buildlink3.mk" +.include "../../x11/kde2/kde2.mk" +.include "../../x11/kdelibs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase2/buildlink3.mk b/x11/kdebase2/buildlink3.mk new file mode 100644 index 00000000000..bddba21fc96 --- /dev/null +++ b/x11/kdebase2/buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/01 23:57:00 snj Exp $ +# XXX BUILDLINK_DEPMETHOD.kdebase?= build + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= kdebase +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdebase} +BUILDLINK_PACKAGES+= kdebase + +.if !empty(KDEBASE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.kdebase+= kdebase>=2.2.2nb4 +BUILDLINK_RECOMMENDED.kdebase2?=kdebase>=2.2.2nb6 +BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase2 +.endif # KDEBASE_BUILDLINK3_MK + +.include "../../x11/kdelibs2/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index bc0bbc69078..4c33aae837f 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2004/03/26 02:28:01 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2004/05/01 23:57:00 snj Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 11 @@ -9,7 +9,7 @@ COMMENT= Support libraries for the KDE integrated X11 desktop CONFLICTS= arts-[1-9]* -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GCC_SHLIB= YES CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" @@ -36,7 +36,7 @@ PLIST_SRC= ${WRKDIR}/PLIST UNLIMIT_RESOURCES= datasize .if defined(USE_CUPS) && (${USE_CUPS} == "YES") -. include "../../print/cups/buildlink2.mk" +. include "../../print/cups/buildlink3.mk" BUILD_DEFS+= USE_CUPS PLIST_SUBST+= CUPS= @@ -103,17 +103,17 @@ USE_PKGSRC_GCC= # defined GCC_REQD+= 3.0 .endif -.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 "../../archivers/bzip2/buildlink3.mk" +.include "../../audio/libaudiofile/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../x11/kde2/kde2.mk" +.include "../../x11/qt2-libs/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdelibs2/buildlink3.mk b/x11/kdelibs2/buildlink3.mk new file mode 100644 index 00000000000..af688133b06 --- /dev/null +++ b/x11/kdelibs2/buildlink3.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/01 23:57:00 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +KDELIBS2_BUILDLINK3_MK:= ${KDELIBS2_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= kdelibs2 +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdelibs2} +BUILDLINK_PACKAGES+= kdelibs2 + +.if !empty(KDELIBS2_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.kdelibs2+= kdelibs>=2.2.2nb9 +BUILDLINK_DEPENDS.kdelibs2+= kdelibs<3.0 # qt2-designer-kde wants KDE 2 +BUILDLINK_RECOMMENDED.kdelibs2?=kdelibs>=2.2.2nb11 +BUILDLINK_PKGSRCDIR.kdelibs2?= ../../x11/kdelibs2 +.endif # KDELIB2S_BUILDLINK3_MK + +KDEDIR= ${BUILDLINK_PREFIX.kdelibs2} + +BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.2.3 + +.include "../../audio/libaudiofile/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../x11/qt2-libs/buildlink3.mk" + +.if defined(USE_CUPS) && (${USE_CUPS} == "YES") +. include "../../print/cups/buildlink3.mk" +.endif + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile index f1a82b5ef5a..c6b85d46a0a 100644 --- a/x11/qt2-designer-kde/Makefile +++ b/x11/qt2-designer-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/03/26 02:28:02 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2004/05/01 23:57:00 snj Exp $ # PKGNAME= qt2-designer-kde-${QTVERSION} @@ -7,7 +7,7 @@ COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support CONFLICTS+= qt2-designer-[0-9]* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 .include "../qt2-libs/Makefile.common" @@ -27,6 +27,6 @@ do-install: ${LIBTOOL} ${INSTALL_PROGRAM} \ ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin -.include "../../x11/kdelibs2/buildlink2.mk" +.include "../../x11/kdelibs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |