Fix build with openssl-1.0. From markd.

Enable openssl again on NetBSD-current and bump PKGREVISION.

3 files changed, 33 insertions, 13 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index fc5152f0613..873e1d70624 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.152 2009/08/29 23:03:34 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2009/09/01 09:51:02 wiz Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -33,6 +33,7 @@ REQD_DIRS+=		${PREFIX}/share/kde/fonts
 REQD_DIRS+=		${PREFIX}/share/kde/fonts/override
 
 CONFIGURE_ARGS+=	--with-ldap="${BUILDLINK_PREFIX.openldap-client}"
+CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=	--without-java
 
 REPLACE_PERL+=		kcontrol/keys/convertShortcuts.pl \
@@ -68,14 +69,6 @@ RCD_SCRIPTS=		kdm
 
 .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
@@ -214,6 +207,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 039161db888..8ed141eddb3 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.109 2009/06/06 04:59:50 hasso Exp $
+$NetBSD: distinfo,v 1.110 2009/09/01 09:51:02 wiz Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -55,5 +55,5 @@ SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
 SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
 SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b
-SHA1 (patch-ge) = 2ad3e1ce9c83b063951f9b96df0a3526eb141381
+SHA1 (patch-ge) = 8470cf03d768d784714e926281757e9d68749360
 SHA1 (patch-kdesud) = acc40c2d1fb65e404a7aa0dbb6eae72fa7ac6a5e
diff --git a/x11/kdebase3/patches/patch-ge b/x11/kdebase3/patches/patch-ge
index 72d11a08f56..ab830491611 100644
--- a/x11/kdebase3/patches/patch-ge
+++ b/x11/kdebase3/patches/patch-ge
@@ -1,4 +1,4 @@
-$NetBSD: patch-ge,v 1.3 2008/05/18 12:19:01 markd Exp $
+$NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $
 
 --- kcontrol/crypto/crypto.cpp.orig	2006-10-02 06:31:49.000000000 +1300
 +++ kcontrol/crypto/crypto.cpp
@@ -14,3 +14,29 @@ $NetBSD: patch-ge,v 1.3 2008/05/18 12:19:01 markd Exp $
  
    SSLv2Box->clear();
    SSLv3Box->clear();
+@@ -2337,8 +2341,10 @@ SSL_METHOD *meth;
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
+-    sc = (meth->get_cipher)(i);
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++    const
++#endif
++    SSL_CIPHER *sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+     // Leak of sc*?
+@@ -2365,8 +2371,10 @@ SSL_METHOD *meth;
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
+-    sc = (meth->get_cipher)(i);
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++    const
++#endif
++    SSL_CIPHER *sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+     // Leak of sc*?