[154266] users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot

[devans at macports.org]

Revision: 154266
          https://trac.macports.org/changeset/154266
Author:   devans at macports.org
Date:     2016-10-25 21:08:03 +0200 (Tue, 25 Oct 2016)
Log Message:
-----------
GNOME-3/stable: gnome-screenshot, update to version 3.22.0, freshen autogen.sh, no longer uses gnome-common, yelp, remove outdated activate hack.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/files/autogen.sh

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/Portfile	2016-10-25 18:59:21 UTC (rev 154265)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/Portfile	2016-10-25 19:08:03 UTC (rev 154266)
@@ -4,12 +4,11 @@
 PortSystem          1.0
 
 name                gnome-screenshot
-version             3.20.1
+version             3.22.0
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
-description         GNOME dictionary application.
-long_description    GNOME Dictionary can look for the definition or translation \
-                    of a word in existing databases over the Internet.
+description         GNOME screenshot application.
+long_description    ${description}
 
 maintainers         juanrgar devans openmaintainer
 categories          gnome
@@ -19,12 +18,11 @@
 
 use_xz              yes
 
-checksums           rmd160  76eacdb5c298a821e22f65d695c9fdce5947f9a8 \
-                    sha256  06a89b6887146cdbbeb64adf11bdae21acf22b0422337041c66eedb21ef7e143
+checksums           rmd160  cdcc1c48a5e1e216f0dcec80c0ac011738e1e16e \
+                    sha256  8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230
 
 depends_build       port:pkgconfig \
                     port:intltool \
-                    port:gnome-common \
                     port:autoconf \
                     port:automake \
                     port:libtool
@@ -34,8 +32,7 @@
                     port:libcanberra \
                     port:xorg-libXext
 
-depends_run         port:gnome-themes-standard \
-                    port:yelp
+depends_run         port:gnome-themes-standard
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
@@ -52,22 +49,6 @@
 configure.args      --disable-schemas-compile \
                     --disable-silent-rules
 
-# if port gnome-utils is installed
-# and gnome-screenshot binary exists
-# and port gnome-screenshot is NOT installed
-# deactivate outdated port gnome-utils
- 
-pre-activate {
-    if {![catch {registry_active gnome-utils}]} {
-        if {[file exists ${prefix}/bin/gnome-screenshot]} {
-            if {[catch {registry_active gnome-screenshot}]} {
-                registry_deactivate_composite gnome-utils "" [list ports_nodepcheck 1]
-            }
-        }
-    }
-}
-
-# port installs desktop application file, and gschemas
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/files/autogen.sh	2016-10-25 18:59:21 UTC (rev 154265)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-screenshot/files/autogen.sh	2016-10-25 19:08:03 UTC (rev 154266)
@@ -1,24 +1,38 @@
 #!/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="gnome-screenshot"
+cd $srcdir
 
-(test -f $srcdir/src/gnome-screenshot.c) || {
-    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 from the GNOME git"
-    exit 1
-}
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
 
-REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.11
-REQUIRED_INTLTOOL_VERSION=0.40.0
-REQUIRED_PKG_CONFIG_VERSION=0.22
-. gnome-autogen.sh
+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
+
+aclocal --install || 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: <http://lists.macports.org/pipermail/macports-changes/attachments/20161025/c9fc5bc6/attachment-0002.html>