From owner-svn-ports-all@freebsd.org Mon Mar 19 05:46:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 756D9F52EAD; Mon, 19 Mar 2018 05:46:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 292707BD19; Mon, 19 Mar 2018 05:46:03 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F8952937; Mon, 19 Mar 2018 05:46:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2J5k23i065633; Mon, 19 Mar 2018 05:46:02 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2J5k2Vr065632; Mon, 19 Mar 2018 05:46:02 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803190546.w2J5k2Vr065632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 19 Mar 2018 05:46:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464981 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 464981 X-SVN-Commit-Repository: ports 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.25 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: Mon, 19 Mar 2018 05:46:03 -0000 Author: tobik Date: Mon Mar 19 05:46:02 2018 New Revision: 464981 URL: https://svnweb.freebsd.org/changeset/ports/464981 Log: Fix post-patch-SNDIO-on in preparation of updates to www/firefox 60.0 and to www/palemoon 27.8.1 Some patches no longer apply to them. WebRTC has moved paths in Firefox 60.0 and no longer needs to be patched. Pale Moon removed WebRTC completely in 27.8.0. PR: 226476 Approved by: gecko (jbeich) Modified: head/Mk/bsd.gecko.mk Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Mon Mar 19 05:40:52 2018 (r464980) +++ head/Mk/bsd.gecko.mk Mon Mar 19 05:46:02 2018 (r464981) @@ -365,13 +365,17 @@ post-patch-SNDIO-on: . for tests in tests gtest @if [ -f "${MOZSRC}/media/libcubeb/${tests}/moz.build" ]; then \ ${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ - ${MOZSRC}/media/libcubeb/${tests}/moz.build \ - ; fi + ${MOZSRC}/media/libcubeb/${tests}/moz.build; \ + fi . endfor - @${REINPLACE_CMD} -e 's|OS==\"openbsd\"|OS==\"${OPSYS:tl}\"|g' \ - ${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi - @${ECHO_CMD} "OS_LIBS += ['sndio']" >> \ - ${MOZSRC}/media/webrtc/signaling/test/common.build + @if [ -f "${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi" ]; then \ + ${REINPLACE_CMD} -e 's|OS==\"openbsd\"|OS==\"${OPSYS:tl}\"|g' \ + ${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi; \ + fi + @if [ -f "${MOZSRC}/media/webrtc/signaling/test/common.build" ]; then \ + ${ECHO_CMD} "OS_LIBS += ['sndio']" >> \ + ${MOZSRC}/media/webrtc/signaling/test/common.build; \ + fi .endif .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54