From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 27 18:47:37 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7705E106564A;
	Thu, 27 Sep 2012 18:47:37 +0000 (UTC)
	(envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 48F2E8FC08;
	Thu, 27 Sep 2012 18:47:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RIlbBg075577;
	Thu, 27 Sep 2012 18:47:37 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RIlb1h075574;
	Thu, 27 Sep 2012 18:47:37 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201209271847.q8RIlb1h075574@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 27 Sep 2012 18:47:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304970 - in head/x11/kdebase3: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 18:47:37 -0000

Author: pawel
Date: Thu Sep 27 18:47:36 2012
New Revision: 304970
URL: http://svn.freebsd.org/changeset/ports/304970

Log:
  - Fix build with OpenSSL >= 1.0
  - Trim Makefile header

Added:
  head/x11/kdebase3/files/patch-kcontrol-crypto-crypto.cpp   (contents, props changed)
Modified:
  head/x11/kdebase3/Makefile

Modified: head/x11/kdebase3/Makefile
==============================================================================
--- head/x11/kdebase3/Makefile	Thu Sep 27 18:44:10 2012	(r304969)
+++ head/x11/kdebase3/Makefile	Thu Sep 27 18:47:36 2012	(r304970)
@@ -1,14 +1,8 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	kdebase3.1
-# Date created:				29 November 2002
-# Whom:					kde@freebsd.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src

Added: head/x11/kdebase3/files/patch-kcontrol-crypto-crypto.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kdebase3/files/patch-kcontrol-crypto-crypto.cpp	Thu Sep 27 18:47:36 2012	(r304970)
@@ -0,0 +1,38 @@
+--- kcontrol/crypto/crypto.cpp.orig	2012-09-26 18:12:48.000000000 +0200
++++ kcontrol/crypto/crypto.cpp	2012-09-26 20:33:56.000000000 +0200
+@@ -2321,7 +2321,11 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++const SSL_METHOD *meth;
++#else
+ SSL_METHOD *meth;
++#endif
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2341,11 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    const SSL_CIPHER *sc;
++#else
+     SSL_CIPHER *sc;
++#endif
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2373,11 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    const SSL_CIPHER *sc;
++#else
+     SSL_CIPHER *sc;
++#endif
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;