CVS commit: pkgsrc/www/firefox

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun  2 18:47:20 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile mozilla-common.mk

Log Message:
firefox: switch to ffmpeg6

Still compiles, still doesn't link against ffmpeg, but MOZ_FFMPEG is
defined to 1.

Bump PKGREVISION.

XXX: Update comment about hunspell: it's now perhaps new enough to
be used from pkgsrc instead of using the provided copy.


To generate a diff of this commit:
cvs rdiff -u -r1.556 -r1.557 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.251 -r1.252 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.556 pkgsrc/www/firefox/Makefile:1.557
--- pkgsrc/www/firefox/Makefile:1.556   Tue May 30 13:26:45 2023
+++ pkgsrc/www/firefox/Makefile Fri Jun  2 18:47:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.556 2023/05/30 13:26:45 abs Exp $
+# $NetBSD: Makefile,v 1.557 2023/06/02 18:47:20 wiz Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            112.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.251 pkgsrc/www/firefox/mozilla-common.mk:1.252
--- pkgsrc/www/firefox/mozilla-common.mk:1.251  Wed Apr 19 14:28:40 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Fri Jun  2 18:47:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.251 2023/04/19 14:28:40 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.252 2023/06/02 18:47:20 wiz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -214,9 +214,10 @@ RUST_REQ=  1.65.0
 #BUILDLINK_API_DEPENDS.libvpx+=        libvpx>=1.3.0
 #.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
-# textproc/hunspell 1.3 is too old
+# TODO: check again, pkgsrc has hunspell 1.7
+# was: textproc/hunspell 1.3 is too old
 #.include "../../textproc/hunspell/buildlink3.mk"
-.include "../../multimedia/ffmpeg5/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2