Revision: 149666 https://trac.macports.org/changeset/149666 Author: devans@macports.org Date: 2016-06-28 13:10:05 -0700 (Tue, 28 Jun 2016) Log Message: ----------- metacity: update to version 3.20.1.1, no longer uses intltool, use autoreconf rather than upstream autogen.sh to reconfigure, remove outdated configuration items. Modified Paths: -------------- trunk/dports/gnome/metacity/Portfile Removed Paths: ------------- trunk/dports/gnome/metacity/files/autogen.sh Property Changed: ---------------- trunk/dports/gnome/metacity/ Property changes on: trunk/dports/gnome/metacity ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/stable/dports/gnome/metacity:121414-148023 /users/devans/GNOME-3/unstable/dports/gnome/metacity:132297-140567 + /users/devans/GNOME-3/stable/dports/gnome/metacity:121414-149664 /users/devans/GNOME-3/unstable/dports/gnome/metacity:132297-140567 Modified: trunk/dports/gnome/metacity/Portfile =================================================================== --- trunk/dports/gnome/metacity/Portfile 2016-06-28 20:09:32 UTC (rev 149665) +++ trunk/dports/gnome/metacity/Portfile 2016-06-28 20:10:05 UTC (rev 149666) @@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0 name metacity -version 3.18.4 +version 3.20.1.1 set branch [join [lrange [split ${version} .] 0 1] .] description A window manager for the adult in you. long_description ${description} @@ -18,11 +18,10 @@ use_xz yes -checksums rmd160 e363944af2f8ecfc7aa411a7b1e0226403621135 \ - sha256 1596caab4b3bee8cdd82962ec8b1f35579d12cde5deafd881d5bfa2dc8594d9f +checksums rmd160 9504351939a7b6820cce3bb78dc4e21031a05631 \ + sha256 ee2f7bcccdf976fbc5b311094259e00796bc8236fa9281deac3d9807bf2899db depends_build port:pkgconfig \ - port:intltool \ port:itstool \ port:autoconf \ port:automake \ @@ -51,22 +50,15 @@ patchfiles patch-no-as-needed.diff -# reconfigure using upstream autogen.sh for intltool 0.51 compatibility +use_autoreconf yes +autoreconf.args -fvi -post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} -} - -configure.cmd ./autogen.sh - configure.args --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --enable-debug \ --disable-compile-warnings \ --disable-silent-rules \ - --disable-schemas-compile \ - --disable-themes-documentation \ - --disable-compositor + --disable-schemas-compile # 'clang < 300' is a guess. We basically need support for C11 redefinition of typedefs. # clang-75 definitely fails. Deleted: trunk/dports/gnome/metacity/files/autogen.sh =================================================================== --- trunk/dports/gnome/metacity/files/autogen.sh 2016-06-28 20:09:32 UTC (rev 149665) +++ trunk/dports/gnome/metacity/files/autogen.sh 2016-06-28 20:10:05 UTC (rev 149666) @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Run this to generate all the initial makefiles, etc. - -srcdir=$(dirname "$0") -test -z "$srcdir" && srcdir=. - -if [ ! -f $srcdir/configure.ac ]; then - echo "**Error**: Directory "\'$srcdir\'" does not look like the top-level" \ - "project directory." - exit 1 -fi - -PKG_NAME=$(autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac") - -if [ "$#" = 0 ] && [ -z "$NOCONFIGURE" ]; 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 '$0'" \ - "command line." >&2 -fi - -set -x -aclocal --install || exit 1 -intltoolize --force --copy --automake || exit 1 -autoreconf --verbose --force --install -Wno-portability || exit 1 -{ set +x; } 2>/dev/null - -if [ -z "$NOCONFIGURE" ]; then - set -x - $srcdir/configure "$@" || exit 1 - { set +x; } 2>/dev/null - - if [ "$1" = "--help" ]; then - exit 0 - else - echo "Now type 'make' to compile $PKG_NAME." || exit 1 - fi -else - echo "Skipping configure process." -fi