From owner-svn-ports-all@FreeBSD.ORG Sun Dec 15 11:45:20 2013 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 2A5312EC; Sun, 15 Dec 2013 11:45:20 +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 F1EF61EFB; Sun, 15 Dec 2013 11:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFBjJqN080682; Sun, 15 Dec 2013 11:45:19 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFBjJN6080681; Sun, 15 Dec 2013 11:45:19 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151145.rBFBjJN6080681@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 11:45:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336514 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 11:45:20 -0000 Author: dinoex Date: Sun Dec 15 11:45:19 2013 New Revision: 336514 URL: http://svnweb.freebsd.org/changeset/ports/336514 Log: - new option COMPAT9 - add USES=desktop-file-utils Modified: head/www/opera/Makefile Modified: head/www/opera/Makefile ============================================================================== --- head/www/opera/Makefile Sun Dec 15 11:43:28 2013 (r336513) +++ head/www/opera/Makefile Sun Dec 15 11:45:19 2013 (r336514) @@ -16,8 +16,8 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPE MAINTAINER= dinoex@FreeBSD.org COMMENT= Blazingly fast, full-featured, standards-compliant browser -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig BUILD_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info @@ -27,9 +27,9 @@ OPERA_VER?= 12.16 OPERA_BUILD?= 1860 MASTER_SITES_VER_PATH= unix/${OPERA_VER:S/.//} +USES= desktop-file-utils USE_XZ= yes USE_XORG= x11 xext sm ice xft xrender -USE_GNOME= desktopfileutils INSTALLS_ICONS= yes MAN1= opera.1 @@ -38,11 +38,15 @@ MANCOMPRESSED= yes NO_BUILD= yes EXPLICIT_PACKAGE_DEPENDS= yes -OPTIONS_DEFINE= CUPS VIDEO GTK2 KDE4 +OPTIONS_DEFINE= CUPS VIDEO GTK2 KDE4 COMPAT9 OPTIONS_DEFAULT= CUPS VIDEO +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 + +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client .include @@ -57,10 +61,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ .endif .endif -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client -.endif - .if ${PORT_OPTIONS:MVIDEO} USE_GSTREAMER+= vorbis ogg theora vp8 good .endif @@ -84,7 +84,11 @@ IGNORE= only for FreeBSD 7.x and higher .endif .if ${OSVERSION} >= 1000054 +.if ${PORT_OPTIONS:MCOMPAT9} RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x +.else +RUN_DEPENDS+= ${LOCALBASE}/lib/gcc46/libstdc++.so.6:${PORTSDIR}/lang/gcc46 +.endif .endif post-extract: