pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Same as for kdelibs3:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1817e2cd0636
branches:  trunk
changeset: 398398:1817e2cd0636
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Aug 29 23:03:34 2009 +0000

description:
Same as for kdelibs3:
Disable openssl on NetBSD>=5.99.15 because of openssl problems (STACK etc)
until someone fixes it.

diffstat:

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

diffs (40 lines):

diff -r c52feeec597b -r 1817e2cd0636 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Sat Aug 29 23:00:54 2009 +0000
+++ b/x11/kdebase3/Makefile     Sat Aug 29 23:03:34 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2009/08/26 19:56:50 sno Exp $
+# $NetBSD: Makefile,v 1.152 2009/08/29 23:03:34 wiz Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
 PKGREVISION=   5
@@ -32,7 +32,6 @@
 REQD_DIRS+=            ${PREFIX}/share/kde/fonts
 REQD_DIRS+=            ${PREFIX}/share/kde/fonts/override
 
-CONFIGURE_ARGS+=       --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=       --with-ldap="${BUILDLINK_PREFIX.openldap-client}"
 CONFIGURE_ARGS+=       --without-java
 
@@ -69,6 +68,14 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.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
+
 LIBS.NetBSD+=          ${EXPORT_SYMBOLS_LDFLAGS}
 
 PLIST_SRC=             ${WRKDIR}/PLIST.Xdpms
@@ -90,7 +97,6 @@
 
 DEPENDS+=              htdig>=3.2.0:../../www/htdig-devel
 
-
 # Solaris 10 has libusb only for 32 bit ABI (see PR 33727).
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64"
 CONFIGURE_ARGS+=       --without-libusb



Home | Main Index | Thread Index | Old Index