From owner-svn-ports-all@FreeBSD.ORG Sun Sep 7 18:10:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A51E6B8E; Sun, 7 Sep 2014 18:10:06 +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 912471974; Sun, 7 Sep 2014 18:10:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87IA6gM022068; Sun, 7 Sep 2014 18:10:06 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87IA6kR022065; Sun, 7 Sep 2014 18:10:06 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201409071810.s87IA6kR022065@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Sun, 7 Sep 2014 18:10:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367592 - head/www/opera X-SVN-Group: ports-head 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.18-1 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: Sun, 07 Sep 2014 18:10:06 -0000 Author: ak Date: Sun Sep 7 18:10:05 2014 New Revision: 367592 URL: http://svnweb.freebsd.org/changeset/ports/367592 QAT: https://qat.redports.org/buildarchive/r367592/ Log: - Fix build on FreeBSD 9 Reported by: antoine Modified: head/www/opera/Makefile head/www/opera/pkg-plist Modified: head/www/opera/Makefile ============================================================================== --- head/www/opera/Makefile Sun Sep 7 18:02:23 2014 (r367591) +++ head/www/opera/Makefile Sun Sep 7 18:10:05 2014 (r367592) @@ -68,6 +68,8 @@ OPERA_ARCH= ${ARCH:S,i386,intel,} .if ${OSVERSION} >= 1000054 BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x +.else +PLIST_SUB+= LIBSTDC="@comment " .endif post-extract: @@ -97,7 +99,9 @@ do-configure: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/opera ${STAGEDIR}${PREFIX}/bin/ ${TAR} -C ${WRKSRC} -cf - lib man share | ${TAR} -C ${STAGEDIR}${PREFIX} -xf - +.if ${OSVERSION} >= 1000054 ${INSTALL_LIB} ${WRKSRC}/libstdc++.so.6 ${STAGEDIR}${PREFIX}/lib/opera +.endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d ${INSTALL_DATA} ${FILESDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/opera.conf Modified: head/www/opera/pkg-plist ============================================================================== --- head/www/opera/pkg-plist Sun Sep 7 18:02:23 2014 (r367591) +++ head/www/opera/pkg-plist Sun Sep 7 18:10:05 2014 (r367592) @@ -4,7 +4,7 @@ lib/opera/gstreamer/plugins/libgstoperam lib/opera/gstreamer/plugins/libgstoperavp8.so lib/opera/liboperagtk2.so lib/opera/liboperakde4.so -lib/opera/libstdc++.so.6 +%%LIBSTDC%%lib/opera/libstdc++.so.6 lib/opera/opera lib/opera/plugins/README lib/opera/pluginwrapper/operapluginwrapper