diff options
| author | tobik <tobik@FreeBSD.org> | 2018-03-19 13:46:02 +0800 |
|---|---|---|
| committer | tobik <tobik@FreeBSD.org> | 2018-03-19 13:46:02 +0800 |
| commit | 19da20b69aee9e7bfda956b2c0e69b65a2e6a741 (patch) | |
| tree | 5ce427257e7098402851f1826dcb96f92fbdd4ac /Mk | |
| parent | 190f57d9860492aeffb2daf61f362e606dd1e529 (diff) | |
| download | freebsd-ports-gnome-19da20b69aee9e7bfda956b2c0e69b65a2e6a741.tar.gz freebsd-ports-gnome-19da20b69aee9e7bfda956b2c0e69b65a2e6a741.tar.zst freebsd-ports-gnome-19da20b69aee9e7bfda956b2c0e69b65a2e6a741.zip | |
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)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index fd8ef59e793c..555135a7e7b4 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -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 |