[117653] users/devans/GNOME-3/stable/dports/gnome

[devans at macports.org]

Revision: 117653
          https://trac.macports.org/changeset/117653
Author:   devans at macports.org
Date:     2014-03-06 21:32:48 -0800 (Thu, 06 Mar 2014)
Log Message:
-----------
GNOME-3/stable/dports: devhelp, epiphany, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/devhelp/
    users/devans/GNOME-3/stable/dports/gnome/epiphany/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/devhelp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/devhelp:108265-116642
/users/rmstonecipher/gnome/devhelp:102363-103172
   + /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/devhelp:108265-117651
/users/rmstonecipher/gnome/devhelp:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile	2014-03-07 05:09:28 UTC (rev 117652)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile	2014-03-07 05:32:48 UTC (rev 117653)
@@ -5,7 +5,6 @@
 
 name            devhelp
 version         3.10.2
-revision        1
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Devhelp is an API documentation browser for GTK+ and GNOME.
@@ -26,10 +25,12 @@
 checksums       rmd160  8aa043fb87408f5c723a1e4a199e6c77a65f5e25 \
                 sha256  498cc367b9cb7924dd4905e9c3e7d9738f572e4735a769fc5de6e2f06bebf793
 
-patchfiles      patch-configure.diff
-
 depends_build   port:pkgconfig \
-                port:intltool
+                port:intltool \
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 depends_lib     port:desktop-file-utils \
                 port:gnome-icon-theme \
@@ -57,6 +58,14 @@
     }
 }
 
+# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd   ./autogen.sh
+
 configure.args  --disable-schemas-compile
 
 variant python26 conflicts python27 description {Build using Python 2.6} {
@@ -74,7 +83,7 @@
 }
 
 post-activate {
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }

Copied: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh (from rev 117651, trunk/dports/gnome/devhelp/files/autogen.sh)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/autogen.sh	2014-03-07 05:32:48 UTC (rev 117653)
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="Devhelp"
+
+(test -f $srcdir/src/dh-main.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common."
+    exit 1
+}
+
+. gnome-autogen.sh

Deleted: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff	2014-03-07 05:09:28 UTC (rev 117652)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff	2014-03-07 05:32:48 UTC (rev 117653)
@@ -1,14 +0,0 @@
---- configure.orig	2013-09-23 09:27:38.000000000 -0700
-+++ configure	2013-11-03 03:21:44.000000000 -0800
-@@ -13351,9 +13351,9 @@
- 
- 
- 
--  PYTHON_PREFIX='${prefix}'
-+  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
- 
--  PYTHON_EXEC_PREFIX='${exec_prefix}'
-+  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
- 
- 
- 


Property changes on: users/devans/GNOME-3/stable/dports/gnome/epiphany
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/epiphany:108265-117326
/users/rmstonecipher/gnome/epiphany:102363-103172
   + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/epiphany:108265-117652
/users/rmstonecipher/gnome/epiphany:102363-103172
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140306/6945cce8/attachment.html>