pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox fix a makefile bug related to the change i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/48af8b86820c
branches:  trunk
changeset: 524431:48af8b86820c
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Jan 25 15:45:19 2007 +0000

description:
fix a makefile bug related to the change in how GNU make-3.81 handles \ newline
in single quoted strings compared to version 3.80 and older

diffstat:

 www/firefox/distinfo         |   3 ++-
 www/firefox/patches/patch-ed |  31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 27ab961c1e6a -r 48af8b86820c www/firefox/distinfo
--- a/www/firefox/distinfo      Thu Jan 25 15:37:12 2007 +0000
+++ b/www/firefox/distinfo      Thu Jan 25 15:45:19 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2007/01/16 23:35:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.61 2007/01/25 15:45:19 dmcmahill Exp $
 
 SHA1 (firefox-1.5.0.9-source.tar.bz2) = 55147ecf4882baf618d1e5eb5f5a438086706425
 RMD160 (firefox-1.5.0.9-source.tar.bz2) = b83bca8f317a6bc00dd40fd0d868cbe82536f45e
@@ -61,3 +61,4 @@
 SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
 SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
+SHA1 (patch-ed) = d5256827efa3f2d49c20794a288842429b780eda
diff -r 27ab961c1e6a -r 48af8b86820c www/firefox/patches/patch-ed
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-ed      Thu Jan 25 15:45:19 2007 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ed,v 1.1 2007/01/25 15:45:19 dmcmahill Exp $
+
+GNU make-3.81 changed the way \newlines are handled inside of single
+quotes.  This fixes the command.  Should still work on older GNU make's
+too.
+
+See https://bugzilla.mozilla.org/show_bug.cgi?id=325148
+
+--- security/coreconf/rules.mk.orig    2005-04-14 20:36:28.000000000 -0400
++++ security/coreconf/rules.mk
+@@ -885,8 +885,7 @@ endif
+ 
+ ifneq (,$(filter-out OpenVMS OS2 WIN%,$(OS_TARGET)))
+ # Can't use sed because of its 4000-char line length limit, so resort to perl
+-.DEFAULT:
+-      @perl -e '                                                            \
++PERL_DEPENDENCIES_PROGRAM= '                                                  \
+           open(MD, "< $(DEPENDENCIES)");                                    \
+           while (<MD>) {                                                    \
+               if (m@ \.*/*$< @) {                                           \
+@@ -914,6 +913,10 @@ ifneq (,$(filter-out OpenVMS OS2 WIN%,$(
+               print "$(MAKE): *** No rule to make target $<.  Stop.\n";     \
+               exit(1);                                                      \
+           }'
++
++.DEFAULT:
++      @perl -e ${PERL_DEPENDENCIES_PROGRAM}
++
+ endif
+ 
+ #############################################################################



Home | Main Index | Thread Index | Old Index