ports/163583: commit references a PR
dfilter service
dfilter at FreeBSD.ORG
Wed Aug 15 19:20:09 UTC 2012
The following reply was made to PR ports/163583; it has been noted by GNATS.
From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/163583: commit references a PR
Date: Wed, 15 Aug 2012 19:19:47 +0000 (UTC)
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
_______________________________________________
svn-ports-all at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
More information about the freebsd-ports-bugs
mailing list