From ce3210f2d6bed1bd337b4d1b0784d0cab35553b2 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 29 Aug 2009 11:26:29 +0000 Subject: Disable ssl support on NetBSD-5.99.15 and newer (openssl-1.0 snapshot) because of incompatible changes (STACK removal etc.) until someone fixes it. --- x11/kdelibs3/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'x11') diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 73750601eb5..3411155b793 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.143 2009/08/26 19:56:39 sno Exp $ +# $NetBSD: Makefile,v 1.144 2009/08/29 11:26:29 wiz Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGREVISION= 3 @@ -18,7 +18,6 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \ ${PKG_SYSCONFDIR}/xdg/menus/applications.menu -CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" CONFIGURE_ARGS+= --with-distribution="NetBSD pkgsrc" SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog @@ -93,6 +92,14 @@ post-install: GCC_REQD+= 2.95 .endif +.if ${OPSYS} == "NetBSD" && (${OS_VERSION:M5.99.1[5-9]*} || ${OS_VERSION:M5.99[2-9]*} || ${OS_VERSION:M[6-9]*}) +# no openssl for us due to incompatible API changes (STACK, ...) +CONFIGURE_ARGS+= --without-ssl +.else +CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" +.include "../../security/openssl/buildlink3.mk" +.endif + .include "../../meta-pkgs/kde3/kde3.mk" .include "../../archivers/bzip2/buildlink3.mk" @@ -106,7 +113,6 @@ GCC_REQD+= 2.95 .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../net/mDNSResponder/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" -- cgit v1.2.3