[136195] trunk/dports/gnome/gnome-system-monitor

[devans at macports.org]

Revision: 136195
          https://trac.macports.org/changeset/136195
Author:   devans at macports.org
Date:     2015-05-11 16:06:19 -0700 (Mon, 11 May 2015)
Log Message:
-----------
gnome-system-monitor: update to version 3.16.0, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-system-monitor/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-system-monitor/files/autogen.sh

Removed Paths:
-------------
    trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-system-monitor/


Property changes on: trunk/dports/gnome/gnome-system-monitor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gnome-system-monitor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor:108276-127580
/users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor:114069-118154,119539-125854
/users/rmstonecipher/gnome/gnome-system-monitor:102363-103172
   + /branches/mld-qt-481/dports/gnome/gnome-system-monitor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor:108276-136069
/users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor:114069-118154,119539-125854,128305-134455
/users/rmstonecipher/gnome/gnome-system-monitor:102363-103172

Modified: trunk/dports/gnome/gnome-system-monitor/Portfile
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/Portfile	2015-05-11 23:06:18 UTC (rev 136194)
+++ trunk/dports/gnome/gnome-system-monitor/Portfile	2015-05-11 23:06:19 UTC (rev 136195)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                gnome-system-monitor
-version             3.14.1
+version             3.16.0
 license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         A system monitor.
@@ -19,15 +19,18 @@
 
 use_xz              yes
 
-checksums           rmd160  1714de288f3ea80964b01001b0b695aeb0e9eff2 \
-                    sha256  948be34a5c3e91acd4a1af0c7711020dd76d274aac547d5836910f2fde09a5e6
+checksums           rmd160  026467e9b54de1e18acc092f6c6f71bb089e2076 \
+                    sha256  00936e8b5d29fc01cd6daf6c119242877d81b2dcca33fb0ee9ce4adec8675391
 
 depends_build       port:pkgconfig \
                     port:intltool \
-                    port:gnome-common \
                     port:itstool \
                     port:yelp-tools \
-                    port:gsed
+                    port:gsed \
+                    port:gnome-common \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool
 
 depends_lib         port:desktop-file-utils \
                     port:gtkmm3 \
@@ -39,16 +42,13 @@
 depends_run         port:gnome-settings-daemon \
                     port:yelp
 
-patchfiles          patch-src-procproperties.cpp.diff
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
 }
 
-use_autoreconf      yes
-autoreconf.args     -fvi
+configure.cmd       ./autogen.sh
 
 configure.args      --disable-silent-rules \
                     --enable-wnck \

Copied: trunk/dports/gnome/gnome-system-monitor/files/autogen.sh (from rev 136069, users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/autogen.sh)
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/gnome-system-monitor/files/autogen.sh	2015-05-11 23:06:19 UTC (rev 136195)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gnome-system-monitor"
+
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common package"
+    exit 1
+}
+
+USE_COMMON_DOC_BUILD=yes
+
+. gnome-autogen.sh

Deleted: trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff	2015-05-11 23:06:18 UTC (rev 136194)
+++ trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff	2015-05-11 23:06:19 UTC (rev 136195)
@@ -1,21 +0,0 @@
---- src/procproperties.cpp.orig	2014-02-19 14:01:08.000000000 -0800
-+++ src/procproperties.cpp	2014-03-19 15:57:08.000000000 -0700
-@@ -29,6 +29,9 @@
- #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#elif defined (__APPLE__)
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
- #endif
- 
- #include "application.h"
-@@ -78,6 +81,8 @@
-         HZ = 100;
-     else
-         HZ = (cinf.stathz ? cinf.stathz : cinf.hz);
-+#elif defined (__APPLE__)
-+    int HZ = 100;
- #endif
- #ifdef __GNU__
-     int HZ;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/d47df539/attachment.html>