[117416] trunk/dports/gnome/gnome-system-log

[devans at macports.org]

Revision: 117416
          https://trac.macports.org/changeset/117416
Author:   devans at macports.org
Date:     2014-02-25 13:43:04 -0800 (Tue, 25 Feb 2014)
Log Message:
-----------
apply upstream patch to prevent configuration failure, use autogen.sh to reconfigure with our intltool.m4, fixes intltool configuration.

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

Added Paths:
-----------
    trunk/dports/gnome/gnome-system-log/files/
    trunk/dports/gnome/gnome-system-log/files/autogen.sh
    trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff

Modified: trunk/dports/gnome/gnome-system-log/Portfile
===================================================================
--- trunk/dports/gnome/gnome-system-log/Portfile	2014-02-25 21:11:36 UTC (rev 117415)
+++ trunk/dports/gnome/gnome-system-log/Portfile	2014-02-25 21:43:04 UTC (rev 117416)
@@ -26,7 +26,9 @@
 
 depends_build       port:pkgconfig \
                     port:intltool \
-                    port:itstool
+                    port:itstool \
+                    port:yelp-tools \
+                    port:gnome-common
 
 depends_lib         port:desktop-file-utils \
                     port:gnome-icon-theme \
@@ -36,6 +38,19 @@
 depends_run         port:gnome-settings-daemon \
                     port:yelp
 
+# apply upstream patch to prevent configuration failure when using autogen.sh 
+# see patch comments for details
+
+patchfiles          patch-fix-autogen-and-configure.diff
+
+# reconfigure with our intltool.m4 using autogen.sh from upstream git
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd       ./autogen.sh
+
 configure.args      --disable-zlib \
                     --disable-schemas-compile \
                     --disable-silent-rules

Added: trunk/dports/gnome/gnome-system-log/files/autogen.sh
===================================================================
--- trunk/dports/gnome/gnome-system-log/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/gnome-system-log/files/autogen.sh	2014-02-25 21:43:04 UTC (rev 117416)
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="GNOME System Log"
+
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level GNOME System Log directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common package"
+    exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

Added: trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff	2014-02-25 21:43:04 UTC (rev 117416)
@@ -0,0 +1,35 @@
+From 195a0c6dc1d713ef15b371f0db063c0607f58146 Mon Sep 17 00:00:00 2001
+From: Seán de Búrca <leftmostcat at gmail.com>
+Date: Mon, 26 Aug 2013 21:57:28 +0000
+Subject: Fix autogen and configure
+
+aclocal needs an explicit macro dir and side-by-side use of IT_PROG_INTLTOOL and AM_GNU_GETTEXT is not supported.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672001
+---
+diff --git a/Makefile.am b/Makefile.am
+index c176536..170b17c 100644
+--- Makefile.am
++++ Makefile.am
+@@ -1,3 +1,5 @@
+ SUBDIRS = data help po src
+ 
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
++
+ EXTRA_DIST = COPYING.docs
+diff --git a/configure.ac b/configure.ac
+index 112c3ba..9abced5 100644
+--- configure.ac
++++ configure.ac
+@@ -21,9 +21,6 @@ PKG_PROG_PKG_CONFIG([0.22])
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal])
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_CXX
+--
+cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140225/e94491ff/attachment.html>