CVS commit: pkgsrc/www/firefox60

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Oct 28 17:40:15 UTC 2018

Modified Files:
        pkgsrc/www/firefox60: Makefile
Added Files:
        pkgsrc/www/firefox60/patches: patch-build_moz.configure_init.configure

Log Message:
Add a patch so that this configures with rust >= 1.29, patterned after
https://bugzilla.mozilla.org/show_bug.cgi?id=1479540


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox60/patches/patch-build_moz.configure_init.configure

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

Modified files:

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.5 pkgsrc/www/firefox60/Makefile:1.6
--- pkgsrc/www/firefox60/Makefile:1.5   Sat Sep 15 06:04:04 2018
+++ pkgsrc/www/firefox60/Makefile       Sun Oct 28 17:40:14 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/09/15 06:04:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2018/10/28 17:40:14 he Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.2
 MOZ_BRANCH_MINOR=      .0esr
+PKGREVISION=   1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/firefox-/firefox60-/:S/.source//:S/b/beta/:S/esr//}

Added files:

Index: pkgsrc/www/firefox60/patches/patch-build_moz.configure_init.configure
diff -u /dev/null pkgsrc/www/firefox60/patches/patch-build_moz.configure_init.configure:1.1
--- /dev/null   Sun Oct 28 17:40:15 2018
+++ pkgsrc/www/firefox60/patches/patch-build_moz.configure_init.configure       Sun Oct 28 17:40:15 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-build_moz.configure_init.configure,v 1.1 2018/10/28 17:40:15 he Exp $
+
+Apply a fix to work with newer rust, patterned after
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+
+--- build/moz.configure/init.configure.orig    2018-06-21 19:06:51.000000000 +0000
++++ build/moz.configure/init.configure
+@@ -577,7 +577,14 @@ def split_triplet(triplet, allow_unknown
+     # There is also a quartet form:
+     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+-    cpu, manufacturer, os = triplet.split('-', 2)
++    # Additionally, some may omit "unknown" when the manufacturer
++    # is not specified and emit
++    #   CPU_TYPE-OPERATING_SYSTEM
++    parts = triplet.split('-', 2)
++    if len(parts) == 3:
++        cpu, _, os = parts
++    else:
++        cpu, os = parts
+ 
+     # Autoconf uses config.sub to validate and canonicalize those triplets,
+     # but the granularity of its results has never been satisfying to our