From owner-svn-ports-all@FreeBSD.ORG Wed Apr 29 21:44:01 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83BDBC5C; Wed, 29 Apr 2015 21:44:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 576781BBA; Wed, 29 Apr 2015 21:44:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TLi1gI055479; Wed, 29 Apr 2015 21:44:01 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TLi083055474; Wed, 29 Apr 2015 21:44:00 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201504292144.t3TLi083055474@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 29 Apr 2015 21:44:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385015 - in branches/2015Q2: databases/evolution-data-server mail/evolution X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 21:44:01 -0000 Author: truckman Date: Wed Apr 29 21:44:00 2015 New Revision: 385015 URL: https://svnweb.freebsd.org/changeset/ports/385015 Log: MFH: r384997 Convert databases/evolution-data-server to USES=compiler:c++11-lib so that on FreeBSD 8 and 9 it will be linked to the newer libstdc++ bundled with lang/gcc. This unbreaks the startup of mail/evolution on FreeBSD 8 and 9 because evolution is also linked to webkit-gtk3, which requires the newer libstdc++ and causes rtld to fail if the base version of libstdc++ has already been loaded. PR: 199746 Approved by: portmgr (delphij) Modified: branches/2015Q2/databases/evolution-data-server/Makefile branches/2015Q2/mail/evolution/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/evolution-data-server/Makefile ============================================================================== --- branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -26,6 +27,11 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORT libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring USES= bison gettext gmake gperf libtool pathfix pkgconfig tar:xz +# Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9. Normally +# this change would be done there, but it is not a C++ application, so it +# does not link directly to libstdc++ and adding the libstdc++ rpath to +# the executable does not work at runtime. +USES+= compiler:c++11-lib USE_GNOME= gnomeprefix gtk30 intlhack introspection:build \ libxml2 USE_OPENLDAP= yes Modified: branches/2015Q2/mail/evolution/Makefile ============================================================================== --- branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution PORTVERSION= 3.12.11 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -106,11 +107,6 @@ CONFIGURE_ARGS+=--disable-contact-maps .include -# webkit-gtk3 needs this -.if ${OSVERSION} < 1000000 -USES+= compiler:c++11-lib -.endif - post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \