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 context 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,9 +1,9 @@
-$NetBSD: distinfo,v 1.96 2009/09/16 19:06:18 tnn Exp $
+$NetBSD: distinfo,v 1.97 2009/09/17 09:41:50 tnn Exp $
 
 SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb
 RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422
 Size (firefox-3.5.3.source.tar.bz2) = 46766383 bytes
-SHA1 (patch-aa) = ec05e36811e82333f14b9c87ae87667c6f943718
+SHA1 (patch-aa) = 64ebd1d94d69acdbf6d5a0c25fc3015d90d5540c
 SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
 SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b

cvs diff -r1.7 -r1.8 pkgsrc/www/firefox/patches/Attic/patch-aa (expand / switch to context 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,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2009/09/16 19:06:18 tnn Exp $
+$NetBSD: patch-aa,v 1.8 2009/09/17 09:41:50 tnn Exp $
 
 --- configure.in.orig	2009-08-24 17:52:36.000000000 +0200
 +++ configure.in
@@ -53,7 +53,7 @@
      else
 -        NSPR_CFLAGS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
 -        NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
-+        NSPR_CFLAGS="-I$prefix/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`"
++        NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`"
 +        NSPR_LIBS="`pkg-config --libs mozilla-nspr`"
      fi
  fi