[135561] trunk/dports/gnome/dia

[devans at macports.org]

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

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

Added Paths:
-----------
    trunk/dports/gnome/dia/files/
    trunk/dports/gnome/dia/files/patch-autogen.sh.diff
    trunk/dports/gnome/dia/files/patch-configure.in.diff

Modified: trunk/dports/gnome/dia/Portfile
===================================================================
--- trunk/dports/gnome/dia/Portfile	2015-04-26 14:23:35 UTC (rev 135560)
+++ trunk/dports/gnome/dia/Portfile	2015-04-26 14:24:34 UTC (rev 135561)
@@ -28,14 +28,12 @@
 checksums           rmd160  a984efa1663cc154f4394060af37fab146f99175 \
                     sha256  22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
 
-post-patch {
-    reinplace s/isspecial/char_isspecial/ \
-        ${worksrcpath}/objects/GRAFCET/boolequation.c
-}
-
 depends_build \
     port:intltool \
-    port:pkgconfig
+    port:pkgconfig \
+    port:autoconf \
+    port:automake \
+    port:libtool
 
 depends_lib \
     port:desktop-file-utils \
@@ -55,11 +53,18 @@
 depends_run \
     port:librsvg
 
-# autoreconf to reconfigure with our intltool.m4
+patchfiles      patch-autogen.sh.diff \
+                patch-configure.in.diff
 
-use_autoreconf  yes
-autoreconf.args -fvi
+post-patch {
+    reinplace s/isspecial/char_isspecial/ \
+        ${worksrcpath}/objects/GRAFCET/boolequation.c
+}
 
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+configure.cmd   ./autogen.sh
+
 configure.args \
     --with-cairo \
     --disable-libemf \

Added: trunk/dports/gnome/dia/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/dia/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/gnome/dia/files/patch-autogen.sh.diff	2015-04-26 14:24:34 UTC (rev 135561)
@@ -0,0 +1,31 @@
+--- autogen.sh.orig	2014-08-24 08:44:07.000000000 -0700
++++ autogen.sh	2015-04-26 03:45:21.000000000 -0700
+@@ -22,7 +22,7 @@
+ 	DIE=1
+ }
+ 
+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
++(glibtool --version) < /dev/null > /dev/null 2>&1 || {
+ 	echo
+ 	echo "You must have libtool installed to compile $PROJECT."
+ 	echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
+@@ -65,8 +65,8 @@
+ echo "Running intltoolize"
+ intltoolize --copy --force --automake
+ 
+-echo "Running libtoolize"
+-libtoolize --copy --force
++echo "Running glibtoolize"
++glibtoolize --copy --force
+ 
+ aclocal $ACLOCAL_FLAGS
+ autoheader
+@@ -88,7 +88,7 @@
+     echo "$@" >&2
+ }
+ 
+-conf_flags="--enable-maintainer-mode --enable-db2html"
++conf_flags=""
+ if test x$NOCONFIGURE = x; then
+     if [ "$#" = 0 ]; then
+       printerr "**Warning**: I am going to run \`configure' with no arguments."

Added: trunk/dports/gnome/dia/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/dia/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/gnome/dia/files/patch-configure.in.diff	2015-04-26 14:24:34 UTC (rev 135561)
@@ -0,0 +1,11 @@
+--- configure.in.orig	2015-04-26 03:20:40.000000000 -0700
++++ configure.in	2015-04-26 03:21:25.000000000 -0700
+@@ -307,7 +307,7 @@
+ dnl idempotent
+ AC_SUBST(INTLOBJS)
+ 
+-localedir='${prefix}/${DATADIRNAME}/locale'
++localedir='${prefix}/share/locale'
+ AC_SUBST(localedir)
+ 
+ dnl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150426/547c56b2/attachment-0001.html>