[135564] trunk/dports/gnome/libgtkhtml3

[devans at macports.org]

Revision: 135564
          https://trac.macports.org/changeset/135564
Author:   devans at macports.org
Date:     2015-04-26 07:33:17 -0700 (Sun, 26 Apr 2015)
Log Message:
-----------
libgtkhtml3: reconfigure using upstream autogen.sh for intltool 0.51 compatibility.

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

Added Paths:
-----------
    trunk/dports/gnome/libgtkhtml3/files/autogen.sh

Modified: trunk/dports/gnome/libgtkhtml3/Portfile
===================================================================
--- trunk/dports/gnome/libgtkhtml3/Portfile	2015-04-26 14:32:16 UTC (rev 135563)
+++ trunk/dports/gnome/libgtkhtml3/Portfile	2015-04-26 14:33:17 UTC (rev 135564)
@@ -30,9 +30,13 @@
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-icon-theme
+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
-depends_lib     port:libsoup \
+depends_lib     port:gnome-icon-theme \
+                port:libsoup \
                 port:enchant \
                 port:iso-codes \
                 port:gtk2 \
@@ -40,20 +44,17 @@
                 port:orbit2 \
                 port:gnuregex
 
-depends_run     port:gnome-icon-theme
-
 patchfiles      patch-configure.ac.diff \
                 patch-components-editor-Makefile.am.diff \
                 patch-gtkhtml-editor.xml.diff
 
-# update m4/intltool.m4 and autoreconf
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-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
 
 configure.args  --enable-deprecated-warning-flags=no \
                 --disable-silent-rules

Added: trunk/dports/gnome/libgtkhtml3/files/autogen.sh
===================================================================
--- trunk/dports/gnome/libgtkhtml3/files/autogen.sh	                        (rev 0)
+++ trunk/dports/gnome/libgtkhtml3/files/autogen.sh	2015-04-26 14:33:17 UTC (rev 135564)
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME="gtkhtml"
+REQUIRED_AUTOCONF_VERSION=2.58
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_LIBTOOL_VERSION=2.2
+REQUIRED_INTLTOOL_VERSION=0.36.3
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(test -f $srcdir/configure.ac \
+  && test -d $srcdir/gtkhtml \
+  && test -f $srcdir/gtkhtml/gtkhtml.h) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level gtkhtml directory"
+    exit 1
+}
+
+gnome_autogen=
+gnome_datadir=
+
+ifs_save="$IFS"; IFS=":"
+for dir in $PATH ; do
+  test -z "$dir" && dir=.
+  if test -f $dir/gnome-autogen.sh ; then
+    gnome_autogen="$dir/gnome-autogen.sh"
+    gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
+    break
+  fi
+done
+IFS="$ifs_save"
+
+if test -z "$gnome_autogen" ; then
+  echo "You need to install the gnome-common module and make"
+  echo "sure the gnome-autogen.sh script is in your \$PATH."
+  exit 1
+fi
+
+GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150426/6c5fc60a/attachment.html>