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 (expand / 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,22 +1,22 @@ @@ -1,22 +1,22 @@
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
cvs diff -r1.112 -r1.113 pkgsrc/www/firefox/mozilla-common.mk (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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./}
@@ -217,20 +217,20 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.37.3 @@ -217,20 +217,20 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.37.3
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"