From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 15 19:19:33 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 765771065674;
	Wed, 15 Aug 2012 19:19:33 +0000 (UTC) (envelope-from mr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 486BD8FC08;
	Wed, 15 Aug 2012 19:19:33 +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 q7FJJXOC099076;
	Wed, 15 Aug 2012 19:19:33 GMT (envelope-from mr@svn.freebsd.org)
Received: (from mr@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FJJXTA099072;
	Wed, 15 Aug 2012 19:19:33 GMT (envelope-from mr@svn.freebsd.org)
Message-Id: <201208151919.q7FJJXTA099072@svn.freebsd.org>
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Wed, 15 Aug 2012 19:19:33 +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: r302593 - head/x11/kdelibs3
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: Wed, 15 Aug 2012 19:19:33 -0000

Author: mr
Date: Wed Aug 15 19:19:32 2012
New Revision: 302593
URL: http://svn.freebsd.org/changeset/ports/302593

Log:
  Add patch to compile with base openssl version 1 as of OSVERSION 1000015.
  
  PR:		ports/163583

Modified:
  head/x11/kdelibs3/Makefile
  head/x11/kdelibs3/distinfo

Modified: head/x11/kdelibs3/Makefile
==============================================================================
--- head/x11/kdelibs3/Makefile	Wed Aug 15 19:07:31 2012	(r302592)
+++ head/x11/kdelibs3/Makefile	Wed Aug 15 19:19:32 2012	(r302593)
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -37,7 +37,6 @@ RUN_DEPENDS=	kdehier>0:${PORTSDIR}/misc/
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		iceauth:${PORTSDIR}/x11/iceauth
 
-CONFLICTS_BUILD=	openssl-1.*
 CONFLICTS+=	kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
 .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
 CONFLICTS+=	kdelibs-[0-9]*
@@ -76,6 +75,14 @@ FONTENCOD=	${LOCALBASE}/lib/X11/fonts/en
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 1000014
+PATCH_SITES=		http://oschtan.academ.org/oschtan-overlay/kde-base/kdelibs/files/
+PATCHFILES=		kdelibs-3.5-openssl-1.0.0.patch
+PATCH_DIST_STRIP=	-p1
+.else
+CONFLICTS_BUILD=       openssl-1.*
+.endif
+
 # bzip2 is required as a libdepend for the help: kioslave
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2

Modified: head/x11/kdelibs3/distinfo
==============================================================================
--- head/x11/kdelibs3/distinfo	Wed Aug 15 19:07:31 2012	(r302592)
+++ head/x11/kdelibs3/distinfo	Wed Aug 15 19:19:32 2012	(r302593)
@@ -1,2 +1,4 @@
 SHA256 (KDE/kdelibs-3.5.10.tar.bz2) = 617e9cb01c70ed4c1b554b373f55deffbd0e12e2cdfeacd7b3d9409372285c72
 SIZE (KDE/kdelibs-3.5.10.tar.bz2) = 15614607
+SHA256 (KDE/kdelibs-3.5-openssl-1.0.0.patch) = 8fa7b2f463e7eb8e553d3e65df252cca29db622f460abf8313671ff93b91674b
+SIZE (KDE/kdelibs-3.5-openssl-1.0.0.patch) = 11455