From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 30 20:06:21 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 D4DA8DED;
 Mon, 30 Dec 2013 20:06:21 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C05EF1A02;
 Mon, 30 Dec 2013 20:06:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUK6LYQ095657;
 Mon, 30 Dec 2013 20:06:21 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBUK6LxR095656;
 Mon, 30 Dec 2013 20:06:21 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201312302006.rBUK6LxR095656@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Mon, 30 Dec 2013 20:06:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338164 - 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Dec 2013 20:06:21 -0000

Author: dinoex
Date: Mon Dec 30 20:06:21 2013
New Revision: 338164
URL: http://svnweb.freebsd.org/changeset/ports/338164

Log:
  - add more sources of libstdc++.so.6

Modified:
  head/www/opera/Makefile

Modified: head/www/opera/Makefile
==============================================================================
--- head/www/opera/Makefile	Mon Dec 30 19:41:21 2013	(r338163)
+++ head/www/opera/Makefile	Mon Dec 30 20:06:21 2013	(r338164)
@@ -38,13 +38,18 @@ MANCOMPRESSED=	yes
 NO_BUILD=	yes
 EXPLICIT_PACKAGE_DEPENDS=	yes
 
-OPTIONS_DEFINE=	CUPS VIDEO GTK2 KDE4 COMPAT9
-OPTIONS_DEFAULT=	CUPS VIDEO
+OPTIONS_DEFINE=	CUPS VIDEO GTK2 KDE4
+OPTIONS_SINGLE=	LIBSTDCXX
+OPTIONS_SINGLE_LIBSTDCXX=	COMPAT9 GCCXX GCC42 GCC46
+OPTIONS_DEFAULT=	CUPS VIDEO COMPAT9
 NO_OPTIONS_SORT=yes
 
 CUPS_DESC=	support for printing (requires CUPS)
 VIDEO_DESC=	support for HTML5 video (requires GStreamer)
-COMPAT9_DESC=	use libstdc++.so.6 from compat9x instead of gcc46
+COMPAT9_DESC=	use libstdc++.so.6 from compat9x
+GCCXX_DESC=	use libstdc++.so.6 from lang/gcc
+GCC42_DESC=	use libstdc++.so.6 from lang/gcc42
+GCC46_DESC=	use libstdc++.so.6 from lang/gcc46
 
 CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 
@@ -86,9 +91,16 @@ IGNORE=		only for FreeBSD 7.x and higher
 .if ${OSVERSION} >= 1000054
 .if ${PORT_OPTIONS:MCOMPAT9}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
-.else
+.endif
+.if ${PORT_OPTIONS:MGCC42}
+RUN_DEPENDS+=	${LOCALBASE}/lib/gcc42/libstdc++.so.6:${PORTSDIR}/lang/gcc42
+.endif
+.if ${PORT_OPTIONS:MGCC46}
 RUN_DEPENDS+=	${LOCALBASE}/lib/gcc46/libstdc++.so.6:${PORTSDIR}/lang/gcc46
 .endif
+.if ${PORT_OPTIONS:MGCCXX}
+RUN_DEPENDS+=	${LOCALBASE}/lib/gcc46/libstdc++.so.6:${PORTSDIR}/lang/gcc
+.endif
 .endif
 
 post-extract: