From owner-svn-ports-head@FreeBSD.ORG Thu May 16 09:41:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3A7CB4DD; Thu, 16 May 2013 09:41:54 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 13755A79; Thu, 16 May 2013 09:41:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G9frgS069491; Thu, 16 May 2013 09:41:53 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G9frB7069490; Thu, 16 May 2013 09:41:53 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201305160941.r4G9frB7069490@svn.freebsd.org> From: Florian Smeets Date: Thu, 16 May 2013 09:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318292 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 09:41:54 -0000 Author: flo Date: Thu May 16 09:41:53 2013 New Revision: 318292 URL: http://svnweb.freebsd.org/changeset/ports/318292 Log: Commit a file forgotten in r318268. Modified: head/Mk/bsd.gecko.mk Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Thu May 16 09:29:36 2013 (r318291) +++ head/Mk/bsd.gecko.mk Thu May 16 09:41:53 2013 (r318292) @@ -179,7 +179,7 @@ Gecko_Pre_Include= bsd.gecko.mk # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 17+ 20+ 17 20+ +# Available values: yes 17+ 21+ 17 21+ # NOTE: # default value 17 is used in case of USE_FIREFOX=yes # @@ -221,11 +221,11 @@ _FIREFOX_BUILD_DEPENDS= yes .endif _FIREFOX_DEFAULT_VERSION= 17 -_FIREFOX_VERSIONS= 17 20 -_FIREFOX_RANGE_VERSIONS= 17+ 20+ +_FIREFOX_VERSIONS= 17 21 +_FIREFOX_RANGE_VERSIONS= 17+ 21+ # For specifying [17, ..]+ -_FIREFOX_20P= 20 ${_FIREFOX_17P} +_FIREFOX_21P= 21 ${_FIREFOX_17P} _FIREFOX_17P= 17 # Set the default Firefox version and check if USE_FIREFOX=yes was given @@ -272,7 +272,7 @@ IGNORE= cannot install: unknown Firefo # Dependence lines for different Firefox versions 17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -20_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +21_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox # Add dependencies .if defined(USE_FIREFOX) @@ -692,6 +692,7 @@ USE_GNOME+= gtk20 .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +CFLAGS+= -O3 MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" MOZ_OPTIONS+= --enable-optimize .else @@ -752,14 +753,8 @@ MOZ_OPTIONS+= --disable-libproxy .if ${PORT_OPTIONS:MWEBRTC} BUILD_DEPENDS+= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= v4l2:${PORTSDIR}/multimedia/libv4l -. if ${MOZILLA_VER:R:R} >= 21 -. if ${PORT_OPTIONS:MOSS} +. if ${PORT_OPTIONS:MOSS} IGNORE= WEBRTC works only with ALSA and PULSEAUDIO audio backends -. endif -. else -. if ! ${PORT_OPTIONS:MALSA} -IGNORE= WEBRTC works only with ALSA audio backend -. endif . endif .else MOZ_OPTIONS+= --disable-webrtc @@ -893,6 +888,7 @@ gecko-post-patch: fenv.h \ kvm.h \ malloc_np.h \ + ostream \ pthread_np.h \ pulse/pulseaudio.h \ spawn.h \