[136086] trunk/dports/gnome/adwaita-icon-theme

[devans at macports.org]

Revision: 136086
          https://trac.macports.org/changeset/136086
Author:   devans at macports.org
Date:     2015-05-11 12:14:38 -0700 (Mon, 11 May 2015)
Log Message:
-----------
adwaita-icon-theme: update to version 3.16.0, dependencies.

Modified Paths:
--------------
    trunk/dports/gnome/adwaita-icon-theme/Portfile
    trunk/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff

Added Paths:
-----------
    trunk/dports/gnome/adwaita-icon-theme/files/autogen.sh

Property Changed:
----------------
    trunk/dports/gnome/adwaita-icon-theme/


Property changes on: trunk/dports/gnome/adwaita-icon-theme
___________________________________________________________________
Added: svn:mergeinfo
   + /users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme:126097-136044
/users/devans/GNOME-3/unstable/dports/gnome/adwaita-icon-theme:128305-134376

Modified: trunk/dports/gnome/adwaita-icon-theme/Portfile
===================================================================
--- trunk/dports/gnome/adwaita-icon-theme/Portfile	2015-05-11 19:14:36 UTC (rev 136085)
+++ trunk/dports/gnome/adwaita-icon-theme/Portfile	2015-05-11 19:14:38 UTC (rev 136086)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                adwaita-icon-theme
-version             3.14.1
+version             3.16.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 maintainers         devans openmaintainer
@@ -20,27 +20,29 @@
 
 use_xz              yes
 
-checksums           rmd160  bb63375d0be862c7fc4790bd09b0c6f764444383 \
-                    sha256  b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee
+checksums           rmd160  5b7a0abd05e5f544842a0d494396698dd13e0c09 \
+                    sha256  a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1
 
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:icon-naming-utils \
-                    port:git
+                    port:gnome-common \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool
 
 depends_lib         port:gtk3 \
                     port:librsvg
 
 patchfiles          patch-configure.ac.diff
 
-# update m4/intltool.m4 and autoreconf
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
 }
 
-use_autoreconf      yes
-autoreconf.args     -fvi
+configure.cmd       ./autogen.sh
 
 use_parallel_build  no
 

Copied: trunk/dports/gnome/adwaita-icon-theme/files/autogen.sh (from rev 136044, users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/files/autogen.sh)
===================================================================
--- trunk/dports/gnome/adwaita-icon-theme/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/adwaita-icon-theme/files/autogen.sh	2015-05-11 19:14:38 UTC (rev 136086)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="adwaita-icon-theme"
+REQUIRED_AUTOMAKE_VERSION=1.9
+
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/index.theme.in.in \
+  && test -d $srcdir/src) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME git"
+    exit 1
+}
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

Modified: trunk/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff	2015-05-11 19:14:36 UTC (rev 136085)
+++ trunk/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff	2015-05-11 19:14:38 UTC (rev 136086)
@@ -1,14 +1,11 @@
---- configure.ac.orig	2014-08-16 18:59:12.000000000 -0700
-+++ configure.ac	2014-08-17 00:20:26.000000000 -0700
-@@ -31,9 +31,9 @@
+--- configure.ac.orig	2014-10-29 09:58:36.000000000 -0700
++++ configure.ac	2014-11-17 15:22:19.000000000 -0800
+@@ -31,7 +31,7 @@
  AC_SUBST([symbolic_render_sizes], [""])
  AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256"])
  
 -AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
 +AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
- if test -z "$GTK_UPDATE_ICON_CACHE"; then
--    AC_MSG_ERROR([Could not find gtk-update-icon-cache])
-+    AC_MSG_ERROR([Could not find gtk-update-icon-cache-3.0])
- fi
  
  # need git, icontool, and inkscape for rendering
+ allow_rendering=yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/66984eaa/attachment.html>