[140656] trunk/dports/gnome/balsa

29 Sep 2015

Revision: 140656
          https://trac.macports.org/changeset/140656
Author:   devans@macports.org
Date:     2015-09-28 18:41:31 -0700 (Mon, 28 Sep 2015)
Log Message:
-----------
balsa: use upstream autogen.sh to reconfigure with our intltool.m4, dependencies, minimize compiler warnings, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/balsa/Portfile
    trunk/dports/gnome/balsa/files/patch-src-sendmsg-window.c.diff

Added Paths:
-----------
    trunk/dports/gnome/balsa/files/autogen.sh
    trunk/dports/gnome/balsa/files/patch-configure.ac.diff

Modified: trunk/dports/gnome/balsa/Portfile
===================================================================

--- trunk/dports/gnome/balsa/Portfile	2015-09-29 00:26:02 UTC (rev 140655)
+++ trunk/dports/gnome/balsa/Portfile	2015-09-29 01:41:31 UTC (rev 140656)
@@ -5,6 +5,7 @@
 
 name                balsa
 version             2.5.2
+revision            1
 license             GPL-3
 description         GNOME e-mail client
 long_description    Balsa is an e-mail client for GNOME, highly \
@@ -25,7 +26,10 @@
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:itstool \
-                    port:yelp-tools
+                    port:yelp-tools \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool
 
 depends_lib         port:desktop-file-utils \
                     port:gtk3 \
@@ -47,8 +51,17 @@
 depends_run         port:gnome-settings-daemon \
                     port:yelp
                 
-patchfiles          patch-src-sendmsg-window.c.diff
+patchfiles          patch-configure.ac.diff \
+                    patch-src-sendmsg-window.c.diff
 
+# use upstream autogen.sh to reconfigure with our intltool.m4
+                    
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd       ./autogen.sh
+
 configure.args      --with-gpgme \
                     --with-gmime=2.6 \
                     --with-gtksourceview \
@@ -62,6 +75,7 @@
                     --with-libnotify \
                     --with-gnome \
                     --enable-pcre \
+                    --disable-more-warnings \
                     --disable-silent-rules
 
 configure.cflags-append -D_DARWIN_C_SOURCE

Added: trunk/dports/gnome/balsa/files/autogen.sh
===================================================================
--- trunk/dports/gnome/balsa/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/balsa/files/autogen.sh	2015-09-29 01:41:31 UTC (rev 140656)
@@ -0,0 +1,19 @@
+#! /bin/sh
+# bootstrap file to be used when autogen.sh fails.
+echo "Running gettextize...  Ignore non-fatal messages."
+glib-gettextize --force --copy || exit 1
+echo "running intltoolize..."
+[ -d m4 ] || mkdir m4
+intltoolize --copy --force --automake || exit 1
+echo "Running libtoolize..."
+glibtoolize --force || exit 1
+echo "Running aclocal..."
+aclocal || exit 1
+echo "Running autoconf..."
+autoconf || exit 1
+echo "Running autoheader..."
+autoheader || exit 1
+echo "Running automake..."
+automake --gnu --add-missing --copy || exit 1
+echo "Running configure $* ..."
+exec ./configure "$@"

Added: trunk/dports/gnome/balsa/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/balsa/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/balsa/files/patch-configure.ac.diff	2015-09-29 01:41:31 UTC (rev 140656)
@@ -0,0 +1,14 @@
+--- configure.ac.orig	2015-05-30 09:46:38.000000000 -0700
++++ configure.ac	2015-08-26 12:03:38.000000000 -0700
+@@ -8,9 +8,9 @@
+ dnl Boilerplace and versioning
+ dnl ###########################################################################
+ 
+-# if autoconf is used not in a git source tree, use version=2.5.0
++# if autoconf is used not in a git source tree, use version=2.5.2
+ AC_INIT([balsa],
+-        m4_esyscmd([test -d .git && echo -n `git describe --tags` || echo -n 2.5.1]),
++        [2.5.2],
+         [])
+ 
+ AM_INIT_AUTOMAKE

Modified: trunk/dports/gnome/balsa/files/patch-src-sendmsg-window.c.diff
===================================================================
--- trunk/dports/gnome/balsa/files/patch-src-sendmsg-window.c.diff	2015-09-29 00:26:02 UTC (rev 140655)
+++ trunk/dports/gnome/balsa/files/patch-src-sendmsg-window.c.diff	2015-09-29 01:41:31 UTC (rev 140656)
@@ -1,6 +1,6 @@
 --- src/sendmsg-window.c.orig	2013-07-17 14:44:51.000000000 -0700
 +++ src/sendmsg-window.c	2013-07-17 14:48:20.000000000 -0700
-@@ -4626,7 +4626,7 @@
+@@ -6858,7 +6858,7 @@
      sw_buffer_signals_connect(bsmsg);
  
  #if HAVE_GTKSOURCEVIEW

    

devans＠macports.org

tags

participants (1)