diff options
Diffstat (limited to 'x11/kdelibs2/Makefile')
| -rw-r--r-- | x11/kdelibs2/Makefile | 57 |
1 files changed, 23 insertions, 34 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} |