Revision: 147264 https://trac.macports.org/changeset/147264 Author: devans@macports.org Date: 2016-03-31 17:49:40 -0700 (Thu, 31 Mar 2016) Log Message: ----------- libgweather: update to version 3.20.0, configuration, update autogen.sh from upstream git master. Modified Paths: -------------- trunk/dports/net/libgweather/Portfile trunk/dports/net/libgweather/files/autogen.sh Property Changed: ---------------- trunk/dports/net/libgweather/ Property changes on: trunk/dports/net/libgweather ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/net/libgweather:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/net/libgweather:108269-140741 /users/devans/GNOME-3/unstable/dports/net/libgweather:116416-118154,119550-125720,132306-140491 + /branches/mld-qt-481/dports/net/libgweather:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/net/libgweather:108269-147262 /users/devans/GNOME-3/unstable/dports/net/libgweather:116416-118154,119550-125720,132306-140491,145827-146944 Modified: trunk/dports/net/libgweather/Portfile =================================================================== --- trunk/dports/net/libgweather/Portfile 2016-04-01 00:48:39 UTC (rev 147263) +++ trunk/dports/net/libgweather/Portfile 2016-04-01 00:49:40 UTC (rev 147264) @@ -5,7 +5,7 @@ PortGroup gobject_introspection 1.0 name libgweather -version 3.18.1 +version 3.20.0 set branch [join [lrange [split ${version} .] 0 1] .] maintainers devans openmaintainer categories net gnome @@ -22,8 +22,8 @@ use_xz yes -checksums rmd160 95274445c39e2a1cd24b8cf7bb852683468e550d \ - sha256 94b2292f8f7616e2aa81b1516befd7b27682b20acecbd5d656b6954990ca7ad0 +checksums rmd160 5e50753efb7a53e47185b667133be60f4e9225b8 \ + sha256 52629b8e9fcd979377f43a2223cf0e7096d3c3e940faa94021132ee0f879b8d6 depends_build port:pkgconfig \ port:intltool \ @@ -50,7 +50,7 @@ configure.cmd ./autogen.sh -configure.args --enable-compile-warnings=minimum \ +configure.args --enable-compile-warnings=no \ --enable-vala=yes \ --enable-glade-catalog=no \ --disable-schemas-compile \ Modified: trunk/dports/net/libgweather/files/autogen.sh =================================================================== --- trunk/dports/net/libgweather/files/autogen.sh 2016-04-01 00:48:39 UTC (rev 147263) +++ trunk/dports/net/libgweather/files/autogen.sh 2016-04-01 00:49:40 UTC (rev 147264) @@ -1,54 +1,29 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. - -PKG_NAME="libgweather" - test -n "$srcdir" || srcdir=`dirname "$0"` test -n "$srcdir" || srcdir=. olddir=`pwd` -cd "$srcdir" -test -f configure.ac || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} +cd $srcdir -mkdir m4/ - -GTKDOCIZE=$(which gtkdocize 2>/dev/null) -if test -z $GTKDOCIZE; then - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." - rm -f gtk-doc.make - cat > gtk-doc.make <<EOF -EXTRA_DIST = -CLEANFILES = -EOF -else - gtkdocize || exit $? -fi - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" exit 1 -fi +} -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -autoreconf --force --install --verbose || exit $? -intltoolize --force --automake || exit $? - -# Replace autopoint Makefile.in.in with intltool's one +aclocal --install || exit 1 +gtkdocize --copy || exit 1 +intltoolize --force --copy --automake || exit 1 sed -e 's/subdir = po/subdir = po-locations/' \ -e 's/GETTEXT_PACKAGE = @GETTEXT_PACKAGE@/GETTEXT_PACKAGE = libgweather-locations/' \ po/Makefile.in.in > po-locations/Makefile.in.in +autoreconf --verbose --force --install -Wno-portability || exit 1 -# Now configure, if asked -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" - +cd $olddir +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + echo "Now type 'make' to compile." +else + echo "Skipping configure process." +fi