Mon Jul 16 02:03:15 2018 UTC ()
Bump PKGREVISION. Change ffmpeg to 4 from 3


(ryoon)
diff -r1.338 -r1.339 pkgsrc/www/firefox/Makefile
diff -r1.112 -r1.113 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.338 -r1.339 pkgsrc/www/firefox/Makefile (switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2018/07/15 23:15:01 1.338
+++ pkgsrc/www/firefox/Makefile 2018/07/16 02:03:15 1.339
@@ -1,107 +1,107 @@ @@ -1,107 +1,107 @@
1# $NetBSD: Makefile,v 1.338 2018/07/15 23:15:01 ryoon Exp $ 1# $NetBSD: Makefile,v 1.339 2018/07/16 02:03:15 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 61.0 4MOZ_BRANCH= 61.0
5MOZ_BRANCH_MINOR= .1 5MOZ_BRANCH_MINOR= .1
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
9PKGREVISION= 1 9PKGREVISION= 2
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
15HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 15HOMEPAGE= http://www.mozilla.com/en-US/firefox/
16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//})
17LICENSE= mpl-1.1 17LICENSE= mpl-1.1
18 18
19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER} 19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER}
20 20
21MOZILLA_DIR= # empty 21MOZILLA_DIR= # empty
22 22
23# Note: when updating remember to conditionalise about-background.png in PLIST 23# Note: when updating remember to conditionalise about-background.png in PLIST
24CONFIGURE_ARGS+= --enable-application=browser 24CONFIGURE_ARGS+= --enable-application=browser
25 25
26CFLAGS+= -I${PREFIX}/include/nspr 26CFLAGS+= -I${PREFIX}/include/nspr
27# for lang/gcc6 27# for lang/gcc6
28CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS 28CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
29 29
30# workround for link of libxul.so etc. 30# workround for link of libxul.so etc.
31LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib 31LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
32LDFLAGS.SunOS+= -lm 32LDFLAGS.SunOS+= -lm
33 33
34NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox 34NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox
35NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox-bin 35NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox-bin
36NOT_PAX_MPROTECT_SAFE+= lib/firefox/plugin-container 36NOT_PAX_MPROTECT_SAFE+= lib/firefox/plugin-container
37 37
38ALL_ENV+= MOZILLA_PKG_NAME=firefox 38ALL_ENV+= MOZILLA_PKG_NAME=firefox
39 39
40# Avoid ld "invalid section index" errors. 40# Avoid ld "invalid section index" errors.
41BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 41BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
42BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 42BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
43 43
44SUBST_CLASSES+= dfly_malloc_h 44SUBST_CLASSES+= dfly_malloc_h
45SUBST_STAGE.dfly_malloc_h= pre-configure 45SUBST_STAGE.dfly_malloc_h= pre-configure
46SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd 46SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd
47SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' 47SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
48SUBST_FILES.dfly_malloc_h= media/libav/libavutil/mem.c 48SUBST_FILES.dfly_malloc_h= media/libav/libavutil/mem.c
49SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c 49SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
50 50
51LDFLAGS.DragonFly= -lplc4 -lnspr4 51LDFLAGS.DragonFly= -lplc4 -lnspr4
52LDFLAGS.FreeBSD= -lplc4 -lnspr4 52LDFLAGS.FreeBSD= -lplc4 -lnspr4
53LDFLAGS.Linux= -lnspr4 53LDFLAGS.Linux= -lnspr4
54 54
55.include "mozilla-common.mk" 55.include "mozilla-common.mk"
56.include "options.mk" 56.include "options.mk"
57 57
58CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py 58CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
59CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py 59CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
60CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py 60CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
61CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py 61CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
62 62
63CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html 63CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
64 64
65MOZILLA=firefox 65MOZILLA=firefox
66MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png 66MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
67.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 67.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
68MOZILLA_NAME= Firefox 68MOZILLA_NAME= Firefox
69.else 69.else
70MOZILLA_NAME= Browser 70MOZILLA_NAME= Browser
71.endif 71.endif
72 72
73SUBST_CLASSES+= sys-dic 73SUBST_CLASSES+= sys-dic
74SUBST_STAGE.sys-dic= pre-configure 74SUBST_STAGE.sys-dic= pre-configure
75SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. 75SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
76SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/glue/mozHunspell.cpp 76SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/glue/mozHunspell.cpp
77SUBST_VARS.sys-dic= PREFIX 77SUBST_VARS.sys-dic= PREFIX
78 78
79post-extract: 79post-extract:
80 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 80 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
81 81
82pre-configure: 82pre-configure:
83 cd ${WRKSRC} && autoconf 83 cd ${WRKSRC} && autoconf
84 cd ${WRKSRC}/js/src && autoconf 84 cd ${WRKSRC}/js/src && autoconf
85 cd ${WRKSRC} && mkdir ${OBJDIR} 85 cd ${WRKSRC} && mkdir ${OBJDIR}
86 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 86 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
87 87
88post-build: 88post-build:
89 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 89 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
90 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 90 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
91 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 91 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
92 < ${FILESDIR}/desktop.in \ 92 < ${FILESDIR}/desktop.in \
93 > ${WRKDIR}/desktop 93 > ${WRKDIR}/desktop
94 94
95INSTALLATION_DIRS+= share/applications share/pixmaps 95INSTALLATION_DIRS+= share/applications share/pixmaps
96post-install: 96post-install:
97 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 97 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
98 ${ECHO} '${PREFIX}/lib/firefox/firefox "$$@"' >> \ 98 ${ECHO} '${PREFIX}/lib/firefox/firefox "$$@"' >> \
99 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 99 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
100 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 100 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
101 ${INSTALL_DATA} ${WRKDIR}/desktop \ 101 ${INSTALL_DATA} ${WRKDIR}/desktop \
102 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 102 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
103 ${INSTALL_DATA} ${MOZILLA_ICON} \ 103 ${INSTALL_DATA} ${MOZILLA_ICON} \
104 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 104 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
105 105
106.include "../../sysutils/desktop-file-utils/desktopdb.mk" 106.include "../../sysutils/desktop-file-utils/desktopdb.mk"
107.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"
cvs diff -r1.112 -r1.113 pkgsrc/www/firefox/mozilla-common.mk (switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2018/07/15 23:15:01 1.112
+++ pkgsrc/www/firefox/mozilla-common.mk 2018/07/16 02:03:15 1.113
@@ -1,236 +1,236 @@ @@ -1,236 +1,236 @@
1# $NetBSD: mozilla-common.mk,v 1.112 2018/07/15 23:15:01 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.113 2018/07/16 02:03:15 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8# Python 2.7 and Python 3.5 or later are required simultaneously. 8# Python 2.7 and Python 3.5 or later are required simultaneously.
9PYTHON_VERSIONS_ACCEPTED= 27 9PYTHON_VERSIONS_ACCEPTED= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11.if !empty(PYTHON_VERSION_DEFAULT:M37) || !empty(PYTHON_VERSION_DEFAULT:M36) \ 11.if !empty(PYTHON_VERSION_DEFAULT:M37) || !empty(PYTHON_VERSION_DEFAULT:M36) \
12 || !empty(PYTHON_VERSION_DEFAULT:M35) 12 || !empty(PYTHON_VERSION_DEFAULT:M35)
13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} 13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} 14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
15.else 15.else
16TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37 16TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37
17ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7 17ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7
18.endif 18.endif
19 19
20HAS_CONFIGURE= yes 20HAS_CONFIGURE= yes
21CONFIGURE_ARGS+= --prefix=${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX}
22USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 22USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
23USE_LANGUAGES+= c99 c++ 23USE_LANGUAGES+= c99 c++
24UNLIMIT_RESOURCES+= datasize 24UNLIMIT_RESOURCES+= datasize
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 28.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
29BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 29BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
30 30
31# Enable Google widevine CDM. This requires external libwidevinecdm.so. 31# Enable Google widevine CDM. This requires external libwidevinecdm.so.
32#CONFIGURE_ARGS+= --enable-eme=widevine 32#CONFIGURE_ARGS+= --enable-eme=widevine
33.endif 33.endif
34 34
35# For rustc/cargo detection 35# For rustc/cargo detection
36CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q} 36CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q}
37CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 37CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
38 38
39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
40 -isystem${X11BASE}/include/pixman-1" 40 -isystem${X11BASE}/include/pixman-1"
41 41
42test: 42test:
43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
45 45
46# tar(1) of OpenBSD 5.5 has no --exclude command line option. 46# tar(1) of OpenBSD 5.5 has no --exclude command line option.
47.if ${OPSYS} == "OpenBSD" 47.if ${OPSYS} == "OpenBSD"
48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
49USE_TOOLS+= bsdtar 49USE_TOOLS+= bsdtar
50.endif 50.endif
51GCC_REQD= 6.1 51GCC_REQD= 6.1
52.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \ 52.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \
53 !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*) 53 !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*)
54USE_PKGSRC_GCC_RUNTIME= yes 54USE_PKGSRC_GCC_RUNTIME= yes
55.endif 55.endif
56.if ${MACHINE_ARCH} == "i386" 56.if ${MACHINE_ARCH} == "i386"
57# Fix for PR pkg/48152. 57# Fix for PR pkg/48152.
58CXXFLAGS+= -march=i586 58CXXFLAGS+= -march=i586
59# This is required for SSE2 code under i386. 59# This is required for SSE2 code under i386.
60CXXFLAGS+= -mstackrealign 60CXXFLAGS+= -mstackrealign
61.endif 61.endif
62 62
63CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 63CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
64CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 64CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
65CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 65CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
66CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure 66CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
67CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 67CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
68CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 68CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
69 69
70CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 70CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
71.if ${OPSYS} != "SunOS" 71.if ${OPSYS} != "SunOS"
72CONFIGURE_ARGS+= --enable-pie 72CONFIGURE_ARGS+= --enable-pie
73.endif 73.endif
74CONFIGURE_ARGS+= --disable-tests 74CONFIGURE_ARGS+= --disable-tests
75CONFIGURE_ARGS+= --with-pthreads 75CONFIGURE_ARGS+= --with-pthreads
76# Mozilla Bug 1432751 76# Mozilla Bug 1432751
77#CONFIGURE_ARGS+= --enable-system-cairo 77#CONFIGURE_ARGS+= --enable-system-cairo
78CONFIGURE_ARGS+= --enable-system-pixman 78CONFIGURE_ARGS+= --enable-system-pixman
79CONFIGURE_ARGS+= --with-system-libvpx 79CONFIGURE_ARGS+= --with-system-libvpx
80# textproc/hunspell 1.3 is too old 80# textproc/hunspell 1.3 is too old
81#CONFIGURE_ARGS+= --enable-system-hunspell 81#CONFIGURE_ARGS+= --enable-system-hunspell
82CONFIGURE_ARGS+= --enable-system-ffi 82CONFIGURE_ARGS+= --enable-system-ffi
83CONFIGURE_ARGS+= --with-system-icu 83CONFIGURE_ARGS+= --with-system-icu
84CONFIGURE_ARGS+= --with-system-nss 84CONFIGURE_ARGS+= --with-system-nss
85CONFIGURE_ARGS+= --with-system-nspr 85CONFIGURE_ARGS+= --with-system-nspr
86CONFIGURE_ARGS+= --with-system-jpeg 86CONFIGURE_ARGS+= --with-system-jpeg
87CONFIGURE_ARGS+= --with-system-zlib 87CONFIGURE_ARGS+= --with-system-zlib
88CONFIGURE_ARGS+= --with-system-bz2 88CONFIGURE_ARGS+= --with-system-bz2
89CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} 89CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
90CONFIGURE_ARGS+= --disable-crashreporter 90CONFIGURE_ARGS+= --disable-crashreporter
91CONFIGURE_ARGS+= --disable-necko-wifi 91CONFIGURE_ARGS+= --disable-necko-wifi
92CONFIGURE_ARGS+= --enable-chrome-format=flat 92CONFIGURE_ARGS+= --enable-chrome-format=flat
93CONFIGURE_ARGS+= --disable-libjpeg-turbo 93CONFIGURE_ARGS+= --disable-libjpeg-turbo
94 94
95CONFIGURE_ARGS+= --disable-gconf 95CONFIGURE_ARGS+= --disable-gconf
96#CONFIGURE_ARGS+= --enable-readline 96#CONFIGURE_ARGS+= --enable-readline
97CONFIGURE_ARGS+= --disable-icf 97CONFIGURE_ARGS+= --disable-icf
98CONFIGURE_ARGS+= --disable-updater 98CONFIGURE_ARGS+= --disable-updater
99 99
100SUBST_CLASSES+= fix-paths 100SUBST_CLASSES+= fix-paths
101SUBST_STAGE.fix-paths= pre-configure 101SUBST_STAGE.fix-paths= pre-configure
102SUBST_MESSAGE.fix-paths= Fixing absolute paths. 102SUBST_MESSAGE.fix-paths= Fixing absolute paths.
103SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 103SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
104SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 104SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
105 105
106SUBST_CLASSES+= prefix 106SUBST_CLASSES+= prefix
107SUBST_STAGE.prefix= pre-configure 107SUBST_STAGE.prefix= pre-configure
108SUBST_MESSAGE.prefix= Setting PREFIX 108SUBST_MESSAGE.prefix= Setting PREFIX
109SUBST_FILES.prefix+= ${MOZILLA_DIR}xpcom/build/BinaryPath.h 109SUBST_FILES.prefix+= ${MOZILLA_DIR}xpcom/build/BinaryPath.h
110SUBST_VARS.prefix+= PREFIX 110SUBST_VARS.prefix+= PREFIX
111 111
112CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 112CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
113CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 113CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
114CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 114CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
115CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 115CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
116CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 116CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
117CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 117CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
118CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 118CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
119CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 119CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
120 120
121CONFIGURE_ENV+= CPP=${CPP} 121CONFIGURE_ENV+= CPP=${CPP}
122 122
123SUBST_CLASSES+= python 123SUBST_CLASSES+= python
124SUBST_STAGE.python= pre-configure 124SUBST_STAGE.python= pre-configure
125SUBST_MESSAGE.python= Fixing path to python. 125SUBST_MESSAGE.python= Fixing path to python.
126SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi 126SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi
127SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' 127SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},'
128 128
129# Build outside ${WRKSRC} 129# Build outside ${WRKSRC}
130# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 130# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
131OBJDIR= ../build 131OBJDIR= ../build
132CONFIGURE_DIRS= ${OBJDIR} 132CONFIGURE_DIRS= ${OBJDIR}
133CONFIGURE_SCRIPT= ${WRKSRC}/configure 133CONFIGURE_SCRIPT= ${WRKSRC}/configure
134 134
135PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86 135PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86
136 136
137.include "../../mk/endian.mk" 137.include "../../mk/endian.mk"
138.if ${MACHINE_ENDIAN} == "little" 138.if ${MACHINE_ENDIAN} == "little"
139PLIST.glskia= yes 139PLIST.glskia= yes
140.endif 140.endif
141 141
142.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 142.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
143PLIST.avx86= yes # see media/libav/README_MOZILLA: only used on x86 143PLIST.avx86= yes # see media/libav/README_MOZILLA: only used on x86
144.endif 144.endif
145 145
146.if ${MACHINE_ARCH} != "sparc64" 146.if ${MACHINE_ARCH} != "sparc64"
147# For some reasons the configure test for GCC bug 26905 still triggers on 147# For some reasons the configure test for GCC bug 26905 still triggers on
148# sparc64, which makes mozilla skip the installation of a few wrapper headers. 148# sparc64, which makes mozilla skip the installation of a few wrapper headers.
149# Other archs end up with one additional file in the SDK headers 149# Other archs end up with one additional file in the SDK headers
150PLIST.throwwrapper= yes 150PLIST.throwwrapper= yes
151.endif 151.endif
152 152
153.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) 153.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
154PLIST.sps= yes 154PLIST.sps= yes
155.endif 155.endif
156 156
157.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) 157.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
158PLIST.tremor= yes 158PLIST.tremor= yes
159.else 159.else
160PLIST.vorbis= yes 160PLIST.vorbis= yes
161.endif 161.endif
162 162
163# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and 163# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
164# installed as a shared library on these platforms. 164# installed as a shared library on these platforms.
165.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android 165.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android
166PLIST.mozglue= yes 166PLIST.mozglue= yes
167.endif 167.endif
168 168
169# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing 169# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
170# support is only available when the toolkit is cairo-cocoa. 170# support is only available when the toolkit is cairo-cocoa.
171CONFIGURE_ARGS.Darwin+= --disable-sandbox 171CONFIGURE_ARGS.Darwin+= --disable-sandbox
172 172
173# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by 173# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
174# default, which is not always possible. 174# default, which is not always possible.
175.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*) 175.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
176CONFIGURE_ARGS+= --enable-macos-target=10.4 176CONFIGURE_ARGS+= --enable-macos-target=10.4
177.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) 177.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
178CONFIGURE_ARGS+= --enable-macos-target=10.5 178CONFIGURE_ARGS+= --enable-macos-target=10.5
179.endif 179.endif
180 180
181# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... 181# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
182.PHONY: create-rm-wrapper 182.PHONY: create-rm-wrapper
183pre-configure: create-rm-wrapper 183pre-configure: create-rm-wrapper
184create-rm-wrapper: 184create-rm-wrapper:
185 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 185 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
186 ${WRAPPER_DIR}/bin/rm 186 ${WRAPPER_DIR}/bin/rm
187 chmod +x ${WRAPPER_DIR}/bin/rm 187 chmod +x ${WRAPPER_DIR}/bin/rm
188 188
189# The configure test for __thread succeeds, but later we end up with: 189# The configure test for __thread succeeds, but later we end up with:
190# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 190# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
191CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 191CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
192 192
193.if ${OPSYS} == "SunOS" 193.if ${OPSYS} == "SunOS"
194# native libbz2.so hides BZ2_crc32Table 194# native libbz2.so hides BZ2_crc32Table
195PREFER.bzip2?= pkgsrc 195PREFER.bzip2?= pkgsrc
196.endif 196.endif
197 197
198.if ${OPSYS} == "OpenBSD" 198.if ${OPSYS} == "OpenBSD"
199PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 199PLIST_SUBST+= DLL_SUFFIX=".so.1.0"
200.elif ${OPSYS} == "Darwin" 200.elif ${OPSYS} == "Darwin"
201PLIST_SUBST+= DLL_SUFFIX=".dylib" 201PLIST_SUBST+= DLL_SUFFIX=".dylib"
202.else 202.else
203PLIST_SUBST+= DLL_SUFFIX=".so" 203PLIST_SUBST+= DLL_SUFFIX=".so"
204.endif 204.endif
205 205
206.include "../../archivers/bzip2/buildlink3.mk" 206.include "../../archivers/bzip2/buildlink3.mk"
207BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 207BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
208.include "../../devel/libevent/buildlink3.mk" 208.include "../../devel/libevent/buildlink3.mk"
209.include "../../devel/libffi/buildlink3.mk" 209.include "../../devel/libffi/buildlink3.mk"
210BUILDLINK_API_DEPENDS.nspr+= nspr>=4.18 210BUILDLINK_API_DEPENDS.nspr+= nspr>=4.18
211.include "../../devel/nspr/buildlink3.mk" 211.include "../../devel/nspr/buildlink3.mk"
212.include "../../textproc/icu/buildlink3.mk" 212.include "../../textproc/icu/buildlink3.mk"
213BUILDLINK_API_DEPENDS.nss+= nss>=3.37.3 213BUILDLINK_API_DEPENDS.nss+= nss>=3.37.3
214.include "../../devel/nss/buildlink3.mk" 214.include "../../devel/nss/buildlink3.mk"
215.include "../../devel/zlib/buildlink3.mk" 215.include "../../devel/zlib/buildlink3.mk"
216.include "../../mk/jpeg.buildlink3.mk" 216.include "../../mk/jpeg.buildlink3.mk"
217.include "../../graphics/MesaLib/buildlink3.mk" 217.include "../../graphics/MesaLib/buildlink3.mk"
218#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 218#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
219#.include "../../graphics/cairo/buildlink3.mk" 219#.include "../../graphics/cairo/buildlink3.mk"
220BUILDLINK_DEPMETHOD.clang= build 220BUILDLINK_DEPMETHOD.clang= build
221.include "../../lang/clang/buildlink3.mk" 221.include "../../lang/clang/buildlink3.mk"
222BUILDLINK_API_DEPENDS.rust+= rust>=1.23.0 222BUILDLINK_API_DEPENDS.rust+= rust>=1.23.0
223BUILDLINK_DEPMETHOD.rust= build 223BUILDLINK_DEPMETHOD.rust= build
224.include "../../lang/rust/buildlink3.mk" 224.include "../../lang/rust/buildlink3.mk"
225BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 225BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
226.include "../../multimedia/libvpx/buildlink3.mk" 226.include "../../multimedia/libvpx/buildlink3.mk"
227.include "../../net/libIDL/buildlink3.mk" 227.include "../../net/libIDL/buildlink3.mk"
228# textproc/hunspell 1.3 is too old 228# textproc/hunspell 1.3 is too old
229#.include "../../textproc/hunspell/buildlink3.mk" 229#.include "../../textproc/hunspell/buildlink3.mk"
230.include "../../multimedia/ffmpeg3/buildlink3.mk" 230.include "../../multimedia/ffmpeg4/buildlink3.mk"
231.include "../../x11/libXt/buildlink3.mk" 231.include "../../x11/libXt/buildlink3.mk"
232BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 232BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
233.include "../../x11/pixman/buildlink3.mk" 233.include "../../x11/pixman/buildlink3.mk"
234.include "../../x11/gtk2/buildlink3.mk" 234.include "../../x11/gtk2/buildlink3.mk"
235.include "../../x11/gtk3/buildlink3.mk" 235.include "../../x11/gtk3/buildlink3.mk"
236.include "../../lang/python/pyversion.mk" 236.include "../../lang/python/pyversion.mk"