From owner-svn-ports-head@freebsd.org Tue Nov 29 17:54:54 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3373AC5C369; Tue, 29 Nov 2016 17:54:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DD0DD1A37; Tue, 29 Nov 2016 17:54:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uATHsrUk073849; Tue, 29 Nov 2016 17:54:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uATHsqs0073847; Tue, 29 Nov 2016 17:54:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611291754.uATHsqs0073847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 29 Nov 2016 17:54:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427388 - in head/www/firefox: . files 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.23 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: Tue, 29 Nov 2016 17:54:54 -0000 Author: jbeich Date: Tue Nov 29 17:54:52 2016 New Revision: 427388 URL: https://svnweb.freebsd.org/changeset/ports/427388 Log: www/firefox: unbreak TEST=on build Added: head/www/firefox/files/patch-bug1320991 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Nov 29 17:14:45 2016 (r427387) +++ head/www/firefox/Makefile Tue Nov 29 17:54:52 2016 (r427388) @@ -57,9 +57,6 @@ OPTIONS_DEFAULT_i386= RUST OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -TEST_BROKEN= No rule to make target '../../../dist/bin/libnspr4.so', needed by \ - '../../../_tests/xpcshell/modules/libmar/tests/unit/libnspr4.so' - .include "${.CURDIR}/../../www/firefox/Makefile.options" WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} Added: head/www/firefox/files/patch-bug1320991 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1320991 Tue Nov 29 17:54:52 2016 (r427388) @@ -0,0 +1,24 @@ +--- modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC ++++ modules/libmar/tests/moz.build +@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh + DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] + + if CONFIG['OS_TARGET'] != 'Android': +- nss_files = ['nss3'] +- if not CONFIG['MOZ_FOLD_LIBS']: +- nss_files.extend([ +- 'nssutil3', +- 'plc4', +- 'nspr4', +- 'plds4', +- ]) +- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( +- ['!/dist/bin/%s%s%s' % ( +- CONFIG['DLL_PREFIX'], +- name, +- CONFIG['DLL_SUFFIX'], +- ) for name in nss_files] +- ) + TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ + '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], + ]