[115685] trunk/dports/gnome/gnome-utils

[devans at macports.org]

Revision: 115685
          https://trac.macports.org/changeset/115685
Author:   devans at macports.org
Date:     2014-01-08 14:33:02 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
gnome-utils: patch to disable baobab, gnome-dictionary, and depend on updated versions, correct dependencies, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-utils/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-utils/files/patch-disable-baobab.diff
    trunk/dports/gnome/gnome-utils/files/patch-disable-gnome-dictionary.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-utils/


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

Modified: trunk/dports/gnome/gnome-utils/Portfile
===================================================================
--- trunk/dports/gnome/gnome-utils/Portfile	2014-01-08 22:29:52 UTC (rev 115684)
+++ trunk/dports/gnome/gnome-utils/Portfile	2014-01-08 22:33:02 UTC (rev 115685)
@@ -5,7 +5,7 @@
 
 name            gnome-utils
 version         3.2.1
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     GNOME utilities
 long_description \
@@ -29,10 +29,12 @@
                 port:gtk-doc
 
 depends_lib     port:desktop-file-utils \
+                port:rarian \
+                port:baobab \
+                port:gnome-dictionary \
                 port:gtk3 \
                 port:gsettings-desktop-schemas \
                 port:gconf \
-                port:libgtop \
                 port:libcanberra \
                 port:zlib \
                 port:grep \
@@ -42,10 +44,12 @@
 depends_run     port:gnome-settings-daemon \
                 port:yelp
 
-patchfiles	    patch-font-viewer-Makefile.am.diff 
+patchfiles	    patch-font-viewer-Makefile.am.diff  \
+                patch-disable-baobab.diff \
+                patch-disable-gnome-dictionary.diff
 
 use_autoreconf	yes
-autoreconf.args	-fi
+autoreconf.args	-fvi
 
 configure.args  --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \

Copied: trunk/dports/gnome/gnome-utils/files/patch-disable-baobab.diff (from rev 115678, users/devans/GNOME-3/stable/dports/gnome/gnome-utils/files/patch-disable-baobab.diff)
===================================================================
--- trunk/dports/gnome/gnome-utils/files/patch-disable-baobab.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-utils/files/patch-disable-baobab.diff	2014-01-08 22:33:02 UTC (rev 115685)
@@ -0,0 +1,25 @@
+--- Makefile.am.orig	2014-01-08 09:07:32.000000000 -0800
++++ Makefile.am	2014-01-08 09:07:59.000000000 -0800
+@@ -24,7 +24,6 @@
+ 	m4			\
+ 	po			\
+ 	libeggsmclient		\
+-	baobab			\
+ 	font-viewer		\
+ 	gnome-dictionary	\
+ 	gnome-screenshot	\
+--- configure.ac	2014-01-08 09:21:27.000000000 -0800
++++ configure.ac.orig	2014-01-08 09:21:20.000000000 -0800
+@@ -143,9 +143,9 @@
+ )
+ 
+ # Baobab checks
+-PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= $LIBGTOP_REQUIRED])
+-AC_SUBST(LIBGTOP_CFLAGS)
+-AC_SUBST(LIBGTOP_LIBS)
++# PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= $LIBGTOP_REQUIRED])
++# AC_SUBST(LIBGTOP_CFLAGS)
++# AC_SUBST(LIBGTOP_LIBS)
+ 
+ PKG_CHECK_MODULES([LIBCANBERRA_GTK], [libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED])
+ AC_SUBST(LIBCANBERRA_GTK_CFLAGS)

Added: trunk/dports/gnome/gnome-utils/files/patch-disable-gnome-dictionary.diff
===================================================================
--- trunk/dports/gnome/gnome-utils/files/patch-disable-gnome-dictionary.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-utils/files/patch-disable-gnome-dictionary.diff	2014-01-08 22:33:02 UTC (rev 115685)
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2014-01-08 13:20:49.000000000 -0800
++++ Makefile.am	2014-01-08 13:21:17.000000000 -0800
+@@ -25,7 +25,6 @@
+ 	po			\
+ 	libeggsmclient		\
+ 	font-viewer		\
+-	gnome-dictionary	\
+ 	gnome-screenshot	\
+ 	gsearchtool		\
+ 	logview			\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/43cc3646/attachment.html>