Thu Sep 17 09:41:50 2009 UTC ()
fix potentially troublesome shell variable expansion in patch


(tnn)
diff -r1.96 -r1.97 pkgsrc/www/firefox/distinfo
diff -r1.7 -r1.8 pkgsrc/www/firefox/patches/patch-aa
cvs diff -r1.96 -r1.97 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2009/09/16 19:06:18 1.96
+++ pkgsrc/www/firefox/distinfo 2009/09/17 09:41:50 1.97
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.96 2009/09/16 19:06:18 tnn Exp $ 1$NetBSD: distinfo,v 1.97 2009/09/17 09:41:50 tnn Exp $
2 2
3SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb 3SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb
4RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422 4RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422
5Size (firefox-3.5.3.source.tar.bz2) = 46766383 bytes 5Size (firefox-3.5.3.source.tar.bz2) = 46766383 bytes
6SHA1 (patch-aa) = ec05e36811e82333f14b9c87ae87667c6f943718 6SHA1 (patch-aa) = 64ebd1d94d69acdbf6d5a0c25fc3015d90d5540c
7SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c 7SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c
8SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 8SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
9SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b 9SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
10SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 10SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
11SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0 11SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
cvs diff -r1.7 -r1.8 pkgsrc/www/firefox/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-aa 2009/09/16 19:06:18 1.7
+++ pkgsrc/www/firefox/patches/Attic/patch-aa 2009/09/17 09:41:50 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.7 2009/09/16 19:06:18 tnn Exp $ 1$NetBSD: patch-aa,v 1.8 2009/09/17 09:41:50 tnn Exp $
2 2
3--- configure.in.orig 2009-08-24 17:52:36.000000000 +0200 3--- configure.in.orig 2009-08-24 17:52:36.000000000 +0200
4+++ configure.in 4+++ configure.in
5@@ -1799,7 +1799,7 @@ case "$target" in 5@@ -1799,7 +1799,7 @@ case "$target" in
6 fi 6 fi
7 ;; 7 ;;
8  8
9-*-freebsd*) 9-*-freebsd*)
10+*-freebsd* | *-dragonfly*) 10+*-freebsd* | *-dragonfly*)
11 if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then 11 if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
12 DLL_SUFFIX=".so.1.0" 12 DLL_SUFFIX=".so.1.0"
13 DSO_LDOPTS="-shared" 13 DSO_LDOPTS="-shared"
14@@ -1813,6 +1813,9 @@ case "$target" in 14@@ -1813,6 +1813,9 @@ case "$target" in
@@ -43,27 +43,27 @@ $NetBSD: patch-aa,v 1.7 2009/09/16 19:06 @@ -43,27 +43,27 @@ $NetBSD: patch-aa,v 1.7 2009/09/16 19:06
43 ;; 43 ;;
44+*-dragonfly*) 44+*-dragonfly*)
45+ AC_CHECK_LIB(c, gethostbyname_r) 45+ AC_CHECK_LIB(c, gethostbyname_r)
46+ ;; 46+ ;;
47 *) 47 *)
48 AC_CHECK_LIB(c_r, gethostbyname_r) 48 AC_CHECK_LIB(c_r, gethostbyname_r)
49 ;; 49 ;;
50@@ -4117,8 +4130,8 @@ else 50@@ -4117,8 +4130,8 @@ else
51 NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib " 51 NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
52 fi 52 fi
53 else 53 else
54- NSPR_CFLAGS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`' 54- NSPR_CFLAGS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
55- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' 55- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
56+ NSPR_CFLAGS="-I$prefix/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`" 56+ NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`"
57+ NSPR_LIBS="`pkg-config --libs mozilla-nspr`" 57+ NSPR_LIBS="`pkg-config --libs mozilla-nspr`"
58 fi 58 fi
59 fi 59 fi
60  60
61@@ -4138,7 +4151,7 @@ fi 61@@ -4138,7 +4151,7 @@ fi
62 if test -n "$MOZ_NATIVE_NSS"; then 62 if test -n "$MOZ_NATIVE_NSS"; then
63 NSS_LIBS="$NSS_LIBS -lcrmf" 63 NSS_LIBS="$NSS_LIBS -lcrmf"
64 else 64 else
65- NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss' 65- NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
66+ NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" 66+ NSS_CFLAGS="`pkg-config --cflags mozilla-nss`"
67 NSS_DEP_LIBS="\ 67 NSS_DEP_LIBS="\
68 \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \ 68 \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
69 \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \ 69 \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \