Revision: 147413 https://trac.macports.org/changeset/147413 Author: devans@macports.org Date: 2016-04-02 23:01:18 -0700 (Sat, 02 Apr 2016) Log Message: ----------- gnome-characters: update to version 3.20.0, update autogen.sh from upsgtream git master, no longer requires gnome-common to build. Modified Paths: -------------- trunk/dports/gnome/gnome-characters/Portfile trunk/dports/gnome/gnome-characters/files/autogen.sh Property Changed: ---------------- trunk/dports/gnome/gnome-characters/ Property changes on: trunk/dports/gnome/gnome-characters ___________________________________________________________________ Added: svn:mergeinfo + /branches/mld-qt-481/dports/gnome/gnome-characters:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-characters:145030-147318 /users/rmstonecipher/gnome/gnome-characters:102363-103172 Modified: trunk/dports/gnome/gnome-characters/Portfile =================================================================== --- trunk/dports/gnome/gnome-characters/Portfile 2016-04-03 06:00:34 UTC (rev 147412) +++ trunk/dports/gnome/gnome-characters/Portfile 2016-04-03 06:01:18 UTC (rev 147413) @@ -5,7 +5,7 @@ PortGroup gobject_introspection 1.0 name gnome-characters -version 3.18.1 +version 3.20.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description A simple utility application to find and insert unusual characters. @@ -18,13 +18,12 @@ use_xz yes -checksums rmd160 44c47a54edf2a983e18a7c8dbbf90fcb893f10a3 \ - sha256 161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac +checksums rmd160 46f40406ecb17fdf1784c484e23972a95d63b325 \ + sha256 a80dd3e7247aa8a8343fee8b06d4d04561b9ebf5eb41d68ab38ed758afc55b87 depends_build port:pkgconfig \ port:intltool \ port:appstream-glib \ - port:gnome-common \ port:autoconf \ port:automake \ port:libtool Modified: trunk/dports/gnome/gnome-characters/files/autogen.sh =================================================================== --- trunk/dports/gnome/gnome-characters/files/autogen.sh 2016-04-03 06:00:34 UTC (rev 147412) +++ trunk/dports/gnome/gnome-characters/files/autogen.sh 2016-04-03 06:01:18 UTC (rev 147413) @@ -1,33 +1,30 @@ #!/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` -ACLOCAL_FLAGS="${ACLOCAL_FLAGS}" +cd $srcdir -test -f $srcdir/configure.ac || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level gnome-characters 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 from GNOME Git (or from" - echo "your OS vendor's package manager)." - exit 1 -} +PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac` -# gllib/unictype contains gperf generated source code -: ${GPERF=gperf} -"$GPERF" --version 2>&1 >/dev/null || { - echo "You need to install gperf." - exit 1 -} +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 -(cd "$srcdir" ; -test -d m4 || mkdir m4/ ; -# git submodule update --init --recursive ; +aclocal --install || exit 1 +intltoolize --force --copy --automake || exit 1 +autoreconf --verbose --force --install -Wno-portability || exit 1 + test -z "$GNULIB_SRCDIR" || \ "$GNULIB_SRCDIR"/gnulib-tool --import \ --source-base=gllib --m4-base=glm4 --tests-base=gltests \ @@ -45,7 +42,16 @@ uninorm/canonical-decomposition \ unistr/u32-to-u8 \ unitypes \ - uniname/uniname ; -) -. gnome-autogen.sh + uniname/uniname \ + uniwidth/width +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