[109997] trunk/dports/gnome/gnome-common

[devans at macports.org]

Revision: 109997
          https://trac.macports.org/changeset/109997
Author:   devans at macports.org
Date:     2013-08-23 16:05:36 -0700 (Fri, 23 Aug 2013)
Log Message:
-----------
gnome-common: patch for automake-1.14.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-common/Portfile
    trunk/dports/gnome/gnome-common/files/patch-gnome-autogen.sh.diff

Modified: trunk/dports/gnome/gnome-common/Portfile
===================================================================
--- trunk/dports/gnome/gnome-common/Portfile	2013-08-23 20:28:06 UTC (rev 109996)
+++ trunk/dports/gnome/gnome-common/Portfile	2013-08-23 23:05:36 UTC (rev 109997)
@@ -5,6 +5,7 @@
 
 name            gnome-common
 version         3.6.0
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome
@@ -26,6 +27,10 @@
 checksums       rmd160  6c672c672f7e1ec437375b88f05acdda9c5ccf17 \
                 sha256  e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95
 
+pre-patch {
+    copy ${worksrcpath}/macros2/gnome-autogen.sh ${worksrcpath}/macros2/gnome-autogen.sh.orig
+}
+
 patchfiles      patch-gnome-autogen.sh.diff
 
 livecheck.type  gnome

Modified: trunk/dports/gnome/gnome-common/files/patch-gnome-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/gnome-common/files/patch-gnome-autogen.sh.diff	2013-08-23 20:28:06 UTC (rev 109996)
+++ trunk/dports/gnome/gnome-common/files/patch-gnome-autogen.sh.diff	2013-08-23 23:05:36 UTC (rev 109997)
@@ -1,5 +1,5 @@
 --- macros2/gnome-autogen.sh.orig	2012-10-15 15:58:19.000000000 -0700
-+++ macros2/gnome-autogen.sh	2013-07-20 16:05:13.000000000 -0700
++++ macros2/gnome-autogen.sh	2013-08-23 14:52:55.000000000 -0700
 @@ -117,7 +117,7 @@
      if [ "$vc_status" != 0 ]; then
  	printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed"
@@ -9,7 +9,7 @@
          printerr "    $vc_source"
  	printerr
  	exit $vc_status
-@@ -346,14 +346,15 @@
+@@ -346,14 +346,16 @@
  
  case $REQUIRED_AUTOMAKE_VERSION in
      1.4*) automake_progs="automake-1.4" ;;
@@ -21,19 +21,20 @@
 -    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
 -    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
 -    1.12*) automake_progs="automake-1.12" ;;
-+    1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-+    1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-+    1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-+    1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
-+    1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
-+    1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
-+    1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;;
-+    1.12*) automake_progs="automake-1.13 automake-1.12" ;;
-+    1.13*) automake_progs="automake-1.13" ;;
++    1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.14 automake-1.13" ;;
++    1.14*) automake_progs="automake-1.14" ;;
  esac
  version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
      "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-@@ -361,43 +362,43 @@
+@@ -361,43 +363,43 @@
  
  if $want_libtool; then
      version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130823/11a25f75/attachment.html>