diff options
| author | Michael Reifenberger <mr@FreeBSD.org> | 2012-08-15 19:19:32 +0000 |
|---|---|---|
| committer | Michael Reifenberger <mr@FreeBSD.org> | 2012-08-15 19:19:32 +0000 |
| commit | b73ee407e6010ad108bcbde89e6df80b384dc2be (patch) | |
| tree | 269b77b4debaf2aeff4407488ba25f1600e2c413 /x11 | |
| parent | 337d24507705aed20e4405f6f844933a321311ea (diff) | |
| download | ports-b73ee407e6010ad108bcbde89e6df80b384dc2be.tar.gz ports-b73ee407e6010ad108bcbde89e6df80b384dc2be.zip | |
Add patch to compile with base openssl version 1 as of OSVERSION 1000015.
PR: ports/163583
Notes
Notes:
svn path=/head/; revision=302593
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs3/Makefile | 11 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c492210337f1..f6ba696d154c 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -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/kdehier \ ${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/encodings/encodings.dir .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 diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index d1b7ff9b7574..e92f3caf1885 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -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 |