Date: Mon, 19 Mar 2018 05:46:02 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464981 - head/Mk Message-ID: <201803190546.w2J5k2Vr065632@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803190546.w2J5k2Vr065632>