ports/163583: [patch] x11/kdelibs3 conflicts with openssl-1

[Anthony Chavez]

>Number:         163583
>Category:       ports
>Synopsis:       [patch] x11/kdelibs3 conflicts with openssl-1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 24 04:20:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Anthony Chavez
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD metis.hexadecagram.org 8.2-STABLE FreeBSD 8.2-STABLE #0: Thu Nov 10 16:13:27 MST 2011 root at metis.hexadecagram.org:/usr/obj/usr/src/sys/METIS i386


	
>Description:
As the CONFLICTS_BUILD variable in the port's Makefile clearly illustrates, kdelibs-3.5.10_8 conflicts with openssl-1.
>How-To-Repeat:
Attempt to install x11/kdelibs3 with openssl-1 installed.
>Fix:
Applying the attached patch produces a successful build on my machine, but remains untested for the time being.

The patch was discovered with the following thread as a starting point:

http://forums.gentoo.org/viewtopic-t-846750-start-0.html

Note that although the PATCH* variables are seemingly configured correctly (and portlint checks out), the patch itself fails to download from the URL configured in PATCH_SITES.  Attempts are instead made to download it from a FreeBSD FTP server, which of course fail.

--- patch.txt begins here ---
--- Makefile.orig	2011-11-06 21:38:57.000000000 -0700
+++ Makefile	2011-12-23 13:29:20.000000000 -0700
@@ -8,13 +8,17 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 PKGNAMESUFFIX?=	# empty
 DIST_SUBDIR=	KDE
 
+PATCH_SITES=		http://oschtan.academ.org/oschtan-overlay/kde-base/kdelibs/files/
+PATCHFILES=		kdelibs-3.5-openssl-1.0.0.patch:1
+PATCH_DIST_STRIP=	-p1:1
+
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
@@ -37,7 +41,6 @@
 		${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]*
--- distinfo.orig	2011-12-23 13:44:52.000000000 -0700
+++ distinfo	2011-12-23 13:32:51.000000000 -0700
@@ -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
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: