svn commit: r408984 - in head: mail/thunderbird/files www/firefox/files

[Jan Beich]

Author: jbeich
Date: Tue Feb 16 09:20:52 2016
New Revision: 408984
URL: https://svnweb.freebsd.org/changeset/ports/408984

Log:
  www/firefox: simplify upstream graphite2 update-helper

Modified:
  head/mail/thunderbird/files/patch-bug847568   (contents, props changed)
  head/www/firefox/files/patch-bug847568   (contents, props changed)

Modified: head/mail/thunderbird/files/patch-bug847568
==============================================================================
--- head/mail/thunderbird/files/patch-bug847568	Tue Feb 16 09:20:14 2016	(r408983)
+++ head/mail/thunderbird/files/patch-bug847568	Tue Feb 16 09:20:52 2016	(r408984)
@@ -101,14 +101,11 @@ diff --git gfx/graphite2/moz-gr-update.s
 index f3d76ea..a9e7fb6 100644
 --- mozilla/gfx/graphite2/moz-gr-update.sh
 +++ mozilla/gfx/graphite2/moz-gr-update.sh
-@@ -37,6 +37,12 @@
+@@ -37,6 +37,9 @@
  #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
-+# closest tag/release to require for system version
-+TAG=$(cd ../graphitedev/ && hg parents --template {latesttag})
-+
-+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \
++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
 +  if /GR2_VERSION_REQUIRE/" configure.in
 +
  # summarize what's been touched

Modified: head/www/firefox/files/patch-bug847568
==============================================================================
--- head/www/firefox/files/patch-bug847568	Tue Feb 16 09:20:14 2016	(r408983)
+++ head/www/firefox/files/patch-bug847568	Tue Feb 16 09:20:52 2016	(r408984)
@@ -101,14 +101,11 @@ diff --git gfx/graphite2/moz-gr-update.s
 index f3d76ea..a9e7fb6 100644
 --- gfx/graphite2/moz-gr-update.sh
 +++ gfx/graphite2/moz-gr-update.sh
-@@ -37,6 +37,12 @@
+@@ -37,6 +37,9 @@
  #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
-+# closest tag/release to require for system version
-+TAG=$(cd ../graphitedev/ && hg parents --template {latesttag})
-+
-+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \
++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
 +  if /GR2_VERSION_REQUIRE/" configure.in
 +
  # summarize what's been touched