[135484] trunk/dports/databases/libgda5

[devans at macports.org]

Revision: 135484
          https://trac.macports.org/changeset/135484
Author:   devans at macports.org
Date:     2015-04-24 12:42:22 -0700 (Fri, 24 Apr 2015)
Log Message:
-----------
libgda5: reconfigure using upstream autogen.sh for intltool 0.51 compatibility.

Modified Paths:
--------------
    trunk/dports/databases/libgda5/Portfile
    trunk/dports/databases/libgda5/files/patch-bdb.diff

Added Paths:
-----------
    trunk/dports/databases/libgda5/files/autogen.sh

Modified: trunk/dports/databases/libgda5/Portfile
===================================================================
--- trunk/dports/databases/libgda5/Portfile	2015-04-24 19:42:19 UTC (rev 135483)
+++ trunk/dports/databases/libgda5/Portfile	2015-04-24 19:42:22 UTC (rev 135484)
@@ -30,7 +30,11 @@
                 port:intltool \
                 port:itstool \
                 port:yelp-tools \
-                port:gtk-doc
+                port:gtk-doc \
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 depends_lib     port:desktop-file-utils \
                 port:readline \
@@ -47,18 +51,17 @@
 depends_run     port:gnome-settings-daemon \
                 port:yelp
 
+gobject_introspection yes
+
 patchfiles      patch-bdb.diff
 
-gobject_introspection yes
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
 }
 
-use_autoreconf  yes
-autoreconf.args -fvi
+configure.cmd   ./autogen.sh
 
 #
 # use embedded libsqlite3 rather than the system version

Added: trunk/dports/databases/libgda5/files/autogen.sh
===================================================================
--- trunk/dports/databases/libgda5/files/autogen.sh	                        (rev 0)
+++ trunk/dports/databases/libgda5/files/autogen.sh	2015-04-24 19:42:22 UTC (rev 135484)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="GNOME Data Access"
+
+(test -f $srcdir/configure.ac \
+  && test -d $srcdir/libgda \
+  && test -f $srcdir/libgda/gda-config.h) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level GDA directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common package"
+    exit 1
+}
+
+# Work around usage of gettext macros (AM_ICONV) without calling gettextize.
+# intltoolize is used intead. https://bugzilla.gnome.org/show_bug.cgi?id=660537
+touch config.rpath
+
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh

Modified: trunk/dports/databases/libgda5/files/patch-bdb.diff
===================================================================
--- trunk/dports/databases/libgda5/files/patch-bdb.diff	2015-04-24 19:42:19 UTC (rev 135483)
+++ trunk/dports/databases/libgda5/files/patch-bdb.diff	2015-04-24 19:42:22 UTC (rev 135484)
@@ -61,7 +61,7 @@
  	    else
 --- configure.ac.orig	2013-11-17 07:18:01.000000000 -0800
 +++ configure.ac	2013-11-19 20:42:58.000000000 -0800
-@@ -375,7 +375,7 @@
+@@ -378,7 +378,7 @@
  	AC_DEFINE(ENABLE_BINRELOC)
  	br_cv_binreloc=yes
      fi
@@ -70,7 +70,7 @@
      if test x"$have_ige" = "xyes"
      then
  	AC_DEFINE(HAVE_MAC_INTEGRATION)
-@@ -385,6 +385,7 @@
+@@ -388,6 +388,7 @@
      LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
      LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
      LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150424/8916721a/attachment.html>