Date: Tue, 28 Nov 2017 21:37:15 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455079 - in head/net-im/ricochet: . files Message-ID: <201711282137.vASLbFPV093863@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue Nov 28 21:37:15 2017 New Revision: 455079 URL: https://svnweb.freebsd.org/changeset/ports/455079 Log: net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic; Fixed order Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13204 Modified: head/net-im/ricochet/Makefile head/net-im/ricochet/files/patch-ricochet.pro Modified: head/net-im/ricochet/Makefile ============================================================================== --- head/net-im/ricochet/Makefile Tue Nov 28 21:27:42 2017 (r455078) +++ head/net-im/ricochet/Makefile Tue Nov 28 21:37:15 2017 (r455079) @@ -17,10 +17,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se LIB_DEPENDS= libprotobuf.so:devel/protobuf -OPTIONS_DEFINE= TOR -OPTIONS_DEFAULT= TOR -TOR_DESC= Install Tor: it is required for ${PORTNAME} to run - USES= compiler:c++11-lib gmake pkgconfig qmake ssl USE_GITHUB= yes GH_ACCOUNT= ricochet-im @@ -29,17 +25,19 @@ USE_QT5= core gui multimedia network qml quick quickco USE_GL= gl QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE} +OPTIONS_DEFINE= TOR +OPTIONS_DEFAULT= TOR +TOR_DESC= Install Tor: it is required for ${PORTNAME} to run + +TOR_RUN_DEPENDS= tor:security/tor + PLIST_FILES= bin/ricochet \ share/applications/ricochet.desktop \ share/icons/hicolor/48x48/apps/ricochet.png \ share/icons/hicolor/scalable/apps/ricochet.svg -TOR_RUN_DEPENDS= tor:security/tor - -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \ ${WRKSRC}/hardened.pri -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-im/ricochet/files/patch-ricochet.pro ============================================================================== --- head/net-im/ricochet/files/patch-ricochet.pro Tue Nov 28 21:27:42 2017 (r455078) +++ head/net-im/ricochet/files/patch-ricochet.pro Tue Nov 28 21:37:15 2017 (r455079) @@ -1,6 +1,6 @@ ---- ricochet.pro.orig 2015-06-17 04:00:47 UTC +--- ricochet.pro.orig 2016-11-04 22:05:33 UTC +++ ricochet.pro -@@ -46,18 +46,18 @@ CONFIG(release,debug|release):DEFINES += +@@ -52,18 +52,18 @@ CONFIG(release,debug|release):DEFINES += contains(DEFINES, RICOCHET_NO_PORTABLE) { unix:!macx { @@ -24,3 +24,15 @@ bundletor.files = tor/* INSTALLS += bundletor DEFINES += BUNDLED_TOR_PATH=\\\"/usr/lib/ricochet/tor/\\\" +@@ -108,7 +108,10 @@ INCLUDEPATH += src + + unix { + !isEmpty(OPENSSLDIR) { +- INCLUDEPATH += $${OPENSSLDIR}/include ++ !equals(OPENSSLDIR, "/usr") { ++ # adding /usr/include to INCLUDEPATH breaks STL's include logic ++ INCLUDEPATH += $${OPENSSLDIR}/include ++ } + LIBS += -L$${OPENSSLDIR}/lib -lcrypto + } else:macx:!packagesExist(libcrypto) { + # Fall back to the OS-provided 0.9.8 if no other libcrypto is present
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711282137.vASLbFPV093863>