Revision: 147377 https://trac.macports.org/changeset/147377 Author: devans@macports.org Date: 2016-04-02 14:30:57 -0700 (Sat, 02 Apr 2016) Log Message: ----------- gnome-online-accounts: update to version 3.20.0, update autogen.sh from upstream git master. Modified Paths: -------------- trunk/dports/gnome/gnome-online-accounts/Portfile trunk/dports/gnome/gnome-online-accounts/files/autogen.sh Property Changed: ---------------- trunk/dports/gnome/gnome-online-accounts/ Property changes on: trunk/dports/gnome/gnome-online-accounts ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:113175-145774 /users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152,119584-125723,128305-134400 + /users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:113175-147292 /users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152,119584-125723,128305-134400,145186-146944 Modified: trunk/dports/gnome/gnome-online-accounts/Portfile =================================================================== --- trunk/dports/gnome/gnome-online-accounts/Portfile 2016-04-02 21:24:30 UTC (rev 147376) +++ trunk/dports/gnome/gnome-online-accounts/Portfile 2016-04-02 21:30:57 UTC (rev 147377) @@ -7,7 +7,7 @@ name gnome-online-accounts # version 3.16.0+ requires webkit2gtk-4.0 -version 3.18.4 +version 3.20.0 license LGPL-2 set branch [join [lrange [split ${version} .] 0 1] .] @@ -21,8 +21,8 @@ use_xz yes -checksums rmd160 f4e1094edd2db9417ff379aca6b32a44d101602e \ - sha256 9f23460aa6b1d8a63a8f3e979cba791cc88b5e07116f07da59fdcea09d79c74d +checksums rmd160 6025e01b80362a437b480570228af44570cd7729 \ + sha256 c98233914c455dc21f8c73904dd2881bee6bfa117a5bdc573ba3a8550c36a460 depends_build port:pkgconfig \ port:intltool \ @@ -93,8 +93,10 @@ livecheck.type none } else { # reconfigure using upstream autogen.sh for intltool 0.51 compatibility + # delete m4/glib-gettext.m4 to force replacement with current version 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: trunk/dports/gnome/gnome-online-accounts/files/autogen.sh =================================================================== --- trunk/dports/gnome/gnome-online-accounts/files/autogen.sh 2016-04-02 21:24:30 UTC (rev 147376) +++ trunk/dports/gnome/gnome-online-accounts/files/autogen.sh 2016-04-02 21:30:57 UTC (rev 147377) @@ -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