pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Disable ssl support on NetBSD-5.99.15 and...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e5346bf89e9
branches:  trunk
changeset: 564170:4e5346bf89e9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Aug 29 11:26:29 2009 +0000

description:
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.

diffstat:

 x11/kdelibs3/Makefile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 9f04d7fd3ab4 -r 4e5346bf89e9 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Sat Aug 29 10:42:55 2009 +0000
+++ b/x11/kdelibs3/Makefile     Sat Aug 29 11:26:29 2009 +0000
@@ -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 @@
 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 @@
 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 @@
 .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"



Home | Main Index | Thread Index | Old Index