Wed Jan 27 13:44:28 2016 UTC ()
Fix "ignoring" error for patching. Reported by pgoyette@


(ryoon)
diff -r1.231 -r1.232 pkgsrc/www/firefox/distinfo
diff -r1.13 -r1.14 pkgsrc/www/firefox/patches/patch-ao
diff -r1.17 -r1.18 pkgsrc/www/firefox/patches/patch-as
cvs diff -r1.231 -r1.232 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2016/01/27 00:08:26 1.231
+++ pkgsrc/www/firefox/distinfo 2016/01/27 13:44:27 1.232
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.231 2016/01/27 00:08:26 ryoon Exp $ 1$NetBSD: distinfo,v 1.232 2016/01/27 13:44:27 ryoon Exp $
2 2
3SHA1 (firefox-44.0.source.tar.xz) = 47189b0a15087dd8f27999f5d920ad204fde8dca 3SHA1 (firefox-44.0.source.tar.xz) = 47189b0a15087dd8f27999f5d920ad204fde8dca
4RMD160 (firefox-44.0.source.tar.xz) = 7942b5a565f2b2e50a5d38c9f88dc30640a162fd 4RMD160 (firefox-44.0.source.tar.xz) = 7942b5a565f2b2e50a5d38c9f88dc30640a162fd
5SHA512 (firefox-44.0.source.tar.xz) = d7a2d3ee595dbf356795ba8029e298d8a69645e11d9201307008ad3a0d15b586cbc119d2273a83843621024d20cd67c7d490228f1c4c09b467cb5dcbd288a864 5SHA512 (firefox-44.0.source.tar.xz) = d7a2d3ee595dbf356795ba8029e298d8a69645e11d9201307008ad3a0d15b586cbc119d2273a83843621024d20cd67c7d490228f1c4c09b467cb5dcbd288a864
6Size (firefox-44.0.source.tar.xz) = 182370528 bytes 6Size (firefox-44.0.source.tar.xz) = 182370528 bytes
7SHA1 (patch-aa) = 0fb7310a484c89572122ea98da72e8e37af4467c 7SHA1 (patch-aa) = 0fb7310a484c89572122ea98da72e8e37af4467c
8SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 8SHA1 (patch-ao) = fef085ff0df6f2fa2e54dca473e849eb7bc2cf84
9SHA1 (patch-as) = 05f31f318155e0f927e13754c0fec5f4d50a39dc 9SHA1 (patch-as) = d5d7f8250a9cd462f25d529c2a79c59a1bba9db2
10SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 10SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
11SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84 11SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84
12SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 12SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
13SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d 13SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d
14SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f 14SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
15SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c 15SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
16SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3 16SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
17SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 17SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
18SHA1 (patch-config_external_moz.build) = fa4f350b077f5c4a1d7a07d123c635bd9c7f1f75 18SHA1 (patch-config_external_moz.build) = fa4f350b077f5c4a1d7a07d123c635bd9c7f1f75
19SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd 19SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
20SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 20SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
21SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b 21SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
22SHA1 (patch-config_system-headers) = a87a47454da13791bd0158ba6c8431164c1fb1b4 22SHA1 (patch-config_system-headers) = a87a47454da13791bd0158ba6c8431164c1fb1b4
cvs diff -r1.13 -r1.14 pkgsrc/www/firefox/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-ao 2014/03/20 21:02:00 1.13
+++ pkgsrc/www/firefox/patches/Attic/patch-ao 2016/01/27 13:44:27 1.14
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ao,v 1.13 2014/03/20 21:02:00 ryoon Exp $ 1$NetBSD: patch-ao,v 1.14 2016/01/27 13:44:27 ryoon Exp $
2 2
3--- toolkit/mozapps/installer/packager.mk.orig 2014-03-15 05:19:37.000000000 +0000 3--- toolkit/mozapps/installer/packager.mk.orig 2016-01-23 23:23:49.000000000 +0000
4+++ toolkit/mozapps/installer/packager.mk 4+++ toolkit/mozapps/installer/packager.mk
5@@ -775,7 +775,7 @@ endif 5@@ -132,7 +132,7 @@ endif
6 $(NSINSTALL) -D $(DESTDIR)$(bindir) 6 $(NSINSTALL) -D $(DESTDIR)$(bindir)
7 $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) 7 $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
8 ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) 8 ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
9-ifdef INSTALL_SDK # Here comes the hard part 9-ifdef INSTALL_SDK # Here comes the hard part
10+ifeq ($(MOZ_APP_NAME),xulrunner) 10+ifeq ($(MOZ_APP_NAME),xulrunner)
11 $(NSINSTALL) -D $(DESTDIR)$(includedir) 11 $(NSINSTALL) -D $(DESTDIR)$(includedir)
12 (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ 12 (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
13 (cd $(DESTDIR)$(includedir) && tar -xf -) 13 (cd $(DESTDIR)$(includedir) && tar -xf -)
cvs diff -r1.17 -r1.18 pkgsrc/www/firefox/patches/Attic/patch-as (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-as 2015/09/23 06:44:42 1.17
+++ pkgsrc/www/firefox/patches/Attic/patch-as 2016/01/27 13:44:27 1.18
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-as,v 1.17 2015/09/23 06:44:42 ryoon Exp $ 1$NetBSD: patch-as,v 1.18 2016/01/27 13:44:27 ryoon Exp $
2 2
3Treat DragonFly like FreeBSD. 3Treat DragonFly like FreeBSD.
4 4
5--- js/src/configure.in.orig 2015-08-24 21:53:09.000000000 +0000 5--- js/src/configure.in.orig 2016-01-23 23:23:39.000000000 +0000
6+++ js/src/configure.in 6+++ js/src/configure.in
7@@ -2190,8 +2190,7 @@ AC_LANG_CPLUSPLUS 7@@ -2123,8 +2123,7 @@ AC_LANG_CPLUSPLUS
8  8
9 MOZ_CXX11 9 MOZ_CXX11
10  10
11-dnl Check for .hidden assembler directive and visibility attribute. 11-dnl Check for .hidden assembler directive and visibility attribute.
12-dnl Borrowed from glibc configure.in 12-dnl Borrowed from glibc configure.in
13+dnl Setup default hidden visibility and wrapped system headers. 13+dnl Setup default hidden visibility and wrapped system headers.
14 dnl =============================================================== 14 dnl ===============================================================
15 if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then 15 if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
16 AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) 16 AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
17@@ -3029,7 +3028,7 @@ if test "$MOZ_MEMORY"; then 17@@ -2960,7 +2959,7 @@ if test "$MOZ_MEMORY"; then
18 *-darwin*) 18 *-darwin*)
19 AC_DEFINE(MOZ_MEMORY_DARWIN) 19 AC_DEFINE(MOZ_MEMORY_DARWIN)
20 ;; 20 ;;
21- *-*freebsd*) 21- *-*freebsd*)
22+ *-*freebsd*|*-*dragonfly*) 22+ *-*freebsd*|*-*dragonfly*)
23 AC_DEFINE(MOZ_MEMORY_BSD) 23 AC_DEFINE(MOZ_MEMORY_BSD)
24 ;; 24 ;;
25 *-android*|*-linuxandroid*) 25 *-android*|*-linuxandroid*)
26@@ -3879,6 +3878,16 @@ MOZ_SUBCONFIGURE_ICU() 26@@ -3808,6 +3807,16 @@ MOZ_SUBCONFIGURE_ICU()
27 dnl ======================================================== 27 dnl ========================================================
28 dnl JavaScript shell 28 dnl JavaScript shell
29 dnl ======================================================== 29 dnl ========================================================
30+ICU_LIB_NAMES= 30+ICU_LIB_NAMES=
31+MOZ_NATIVE_ICU= 31+MOZ_NATIVE_ICU=
32+MOZ_ARG_WITH_BOOL(system-icu, 32+MOZ_ARG_WITH_BOOL(system-icu,
33+[ --with-system-icu 33+[ --with-system-icu
34+ Use system icu (located with pkgconfig)], 34+ Use system icu (located with pkgconfig)],
35+ MOZ_NATIVE_ICU=1) 35+ MOZ_NATIVE_ICU=1)
36+ 36+
37+if test -n "$MOZ_NATIVE_ICU"; then 37+if test -n "$MOZ_NATIVE_ICU"; then
38+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) 38+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
39+fi 39+fi