[118933] trunk/dports/gnome/baobab
devans at macports.org
devans at macports.org
Sun Apr 13 18:59:55 PDT 2014
Revision: 118933
https://trac.macports.org/changeset/118933
Author: devans at macports.org
Date: 2014-04-13 18:59:55 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
baobab: update to version 3.12.0.
Modified Paths:
--------------
trunk/dports/gnome/baobab/Portfile
Added Paths:
-----------
trunk/dports/gnome/baobab/files/patch-configure.ac.diff
Removed Paths:
-------------
trunk/dports/gnome/baobab/files/autogen.sh
trunk/dports/gnome/baobab/files/patch-src-Makefile.am.diff
Property Changed:
----------------
trunk/dports/gnome/baobab/
Property changes on: trunk/dports/gnome/baobab
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/baobab:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/baobab:118273-118733
/users/rmstonecipher/gnome/baobab:102363-103172
Modified: trunk/dports/gnome/baobab/Portfile
===================================================================
--- trunk/dports/gnome/baobab/Portfile 2014-04-14 01:59:20 UTC (rev 118932)
+++ trunk/dports/gnome/baobab/Portfile 2014-04-14 01:59:55 UTC (rev 118933)
@@ -4,7 +4,7 @@
PortSystem 1.0
name baobab
-version 3.10.1
+version 3.12.0
license GPL-2 GFDL-1.1
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME disk usage analyzer.
@@ -23,16 +23,13 @@
use_xz yes
-checksums rmd160 9af4c29eb67bb2444c9f35788a9688bd779a53b5 \
- sha256 23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9
+checksums rmd160 09d8d8877dbe88ca839efbbaf10cb2103936e033 \
+ sha256 538c9d452ecfe93353e90e6781aa7bf241ab9f1f8e27e7b3a614cf31a3576b0a
depends_build port:pkgconfig \
port:intltool \
port:itstool \
- port:yelp-tools \
- port:autoconf \
- port:automake \
- port:libtool
+ port:yelp-tools
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -43,16 +40,16 @@
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles patch-src-Makefile.am.diff
+patchfiles patch-configure.ac.diff
-# use autogen.sh from upstream git to update m4/intltool.m4 using intltoolize and autoreconf
+# update m4/intltool.m4 and autoreconf
-post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
- file delete -force ${worksrcpath}/m4
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
}
-configure.cmd ./autogen.sh
+use_autoreconf yes
+autoreconf.args -fvi
configure.args --disable-schemas-compile \
--disable-silent-rules
Deleted: trunk/dports/gnome/baobab/files/autogen.sh
===================================================================
--- trunk/dports/gnome/baobab/files/autogen.sh 2014-04-14 01:59:20 UTC (rev 118932)
+++ trunk/dports/gnome/baobab/files/autogen.sh 2014-04-14 01:59:55 UTC (rev 118933)
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-OLDDIR=`pwd`
-cd $srcdir
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
- echo "*** No autoreconf found, please install it ***"
- exit 1
-fi
-
-INTLTOOLIZE=`which intltoolize`
-if test -z $INTLTOOLIZE; then
- echo "*** No intltoolize found, please install the intltool package ***"
- exit 1
-fi
-
-GNOMEDOC=`which yelp-build`
-if test -z $GNOMEDOC; then
- echo "*** The tools to build the documentation are not found,"
- echo " please install the yelp-tools package ***"
- exit 1
-fi
-
-autopoint --force || exit $?
-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
-
-cd $OLDDIR
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
-
Copied: trunk/dports/gnome/baobab/files/patch-configure.ac.diff (from rev 118733, users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-configure.ac.diff)
===================================================================
--- trunk/dports/gnome/baobab/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/baobab/files/patch-configure.ac.diff 2014-04-14 01:59:55 UTC (rev 118933)
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2014-03-28 07:40:20.000000000 -0700
++++ configure.ac 2014-03-28 07:41:37.000000000 -0700
+@@ -17,8 +17,9 @@
+ # i18n stuff
+ IT_PROG_INTLTOOL(0.40.0)
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++dnl AM_GNU_GETTEXT macros cannot be used with IT_PROG_INTLTOOL
++dnl AM_GNU_GETTEXT([external])
++dnl AM_GNU_GETTEXT_VERSION([0.17])
+
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST([GETTEXT_PACKAGE])
Deleted: trunk/dports/gnome/baobab/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/baobab/files/patch-src-Makefile.am.diff 2014-04-14 01:59:20 UTC (rev 118932)
+++ trunk/dports/gnome/baobab/files/patch-src-Makefile.am.diff 2014-04-14 01:59:55 UTC (rev 118933)
@@ -1,14 +0,0 @@
---- src/Makefile.am.orig 2013-09-04 03:24:23.000000000 -0700
-+++ src/Makefile.am 2014-03-06 12:34:40.000000000 -0800
-@@ -43,11 +43,8 @@
- AM_CFLAGS = \
- $(BAOBAB_CFLAGS) \
- -Wall \
-- -Wno-unused-but-set-variable \
-- -Wno-unused-variable \
- $(NULL)
-
--baobab_LDFLAGS = -export-dynamic
- baobab_LDADD = \
- -lm \
- $(BAOBAB_LIBS) \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/0396a9c6/attachment.html>
More information about the macports-changes
mailing list