[146855] users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts

[devans at macports.org]

Revision: 146855
          https://trac.macports.org/changeset/146855
Author:   devans at macports.org
Date:     2016-03-18 23:06:37 -0700 (Fri, 18 Mar 2016)
Log Message:
-----------
GNOME-3/unstable: gnome-online-accounts, update to version 3.19.92.1, update autogen.sh from upstream git master.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/autogen.sh

Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile	2016-03-19 04:33:10 UTC (rev 146854)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile	2016-03-19 06:06:37 UTC (rev 146855)
@@ -7,7 +7,7 @@
 name                gnome-online-accounts
 
 # version 3.16.0+ requires webkit2gtk-4.0
-version             3.19.90
+version             3.19.92.1
 
 license             LGPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -21,8 +21,8 @@
 
 use_xz              yes
 
-checksums           rmd160  9b8a23aaed42d70f2079ec4f1a145e6b80fde476 \
-                    sha256  7e899a16f57e6eff852422830538901ef44248f6be8ceff74d2b927905c2f93c
+checksums           rmd160  f24eda4b0693b992bdbf3e18e9aa532d322fa822 \
+                    sha256  ce7c257ceec410f8fc467984fcb126db18dd34680e0dcb1ddea4130ec52269a4
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -93,8 +93,11 @@
         livecheck.type  none
     } else {
         # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+        patchfiles-append \
+            patch-m4.diff
         post-patch {
             xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+            delete ${worksrcpath}/m4/glib-gettext.m4
         }
         configure.cmd   ./autogen.sh
         depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk

Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/autogen.sh	2016-03-19 04:33:10 UTC (rev 146854)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/autogen.sh	2016-03-19 06:06:37 UTC (rev 146855)
@@ -1,24 +1,45 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
 
-PKG_NAME="goa"
+cd $srcdir
 
-(test -f $srcdir/src/Makefile.am) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
+(test -f configure.ac) || {
+	echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+	exit 1
 }
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common"
-    exit 1
-}
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
 
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+	echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+	echo "*** If you wish to pass any to it, please specify them on the" >&2
+	echo "*** '$0' command line." >&2
+	echo "" >&2
+fi
+
+# git submodule update --init --recursive
+
 cd telepathy-account-widgets
-sh autogen.sh --no-configure
+NOCONFIGURE=1 sh autogen.sh
 cd ..
 
-. gnome-autogen.sh "$@"
+aclocal --install --force || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+	$srcdir/configure "$@" || exit 1
+
+	if [ "$1" = "--help" ]; then exit 0 else
+		echo "Now type 'make' to compile $PKG_NAME" || exit 1
+	fi
+else
+	echo "Skipping configure process."
+fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160318/f1190826/attachment-0001.html>