[138710] trunk/dports/gnome/gdmap

[devans at macports.org]

Revision: 138710
          https://trac.macports.org/changeset/138710
Author:   devans at macports.org
Date:     2015-07-16 16:14:00 -0700 (Thu, 16 Jul 2015)
Log Message:
-----------
gdmap: at maintainer's invitation, reconfigure with our intltool using autogen.sh, removes dependency on a specific perl version.

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

Added Paths:
-----------
    trunk/dports/gnome/gdmap/files/patch-autogen.sh.diff

Modified: trunk/dports/gnome/gdmap/Portfile
===================================================================
--- trunk/dports/gnome/gdmap/Portfile	2015-07-16 23:03:20 UTC (rev 138709)
+++ trunk/dports/gnome/gdmap/Portfile	2015-07-16 23:14:00 UTC (rev 138710)
@@ -5,7 +5,7 @@
 
 name                gdmap
 version             0.8.1
-revision            2
+revision            3
 license             GPL-2
 description         GdMap is a tool which allows to visualize disk space.
 long_description    ${description} \
@@ -33,16 +33,21 @@
 depends_lib         port:gtk2
 
 depends_build       port:pkgconfig \
-                    port:p5.22-xml-parser
+                    port:autoconf \
+                    port:automake \
+                    port:intltool
 
 # Patches from http://sourceforge.net/p/gdmap/bugs/
-patchfiles          gdmap-0.8.1-deprecated.patch \
+patchfiles          patch-autogen.sh.diff \
+                    gdmap-0.8.1-deprecated.patch \
                     hardlinks.patch \
                     symlinks.patch
 
 post-extract {
-    reinplace "s/ -DGTK_DISABLE_DEPRECATED//g" configure
+    reinplace "s/ -DGTK_DISABLE_DEPRECATED//g" configure.ac
     reinplace "s|#include \<sys/vfs.h\>||g" src/gui_main.c
 }
 
-configure.env-append    INTLTOOL_PERL=${prefix}/bin/perl5.22
+# reconfigure using autogen.sh for intltool 0.51 compatibility
+
+configure.cmd       ./autogen.sh && ./configure

Added: trunk/dports/gnome/gdmap/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/gdmap/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/gnome/gdmap/files/patch-autogen.sh.diff	2015-07-16 23:14:00 UTC (rev 138710)
@@ -0,0 +1,39 @@
+--- autogen.sh.orig	2015-07-16 14:15:15.000000000 -0700
++++ autogen.sh	2015-07-16 14:25:37.000000000 -0700
+@@ -168,7 +168,8 @@
+         fi
+         shift
+     done
+-
++    
++    ACLOCAL_FLAGS=-I`$ACLOCAL --print-ac-dir`
+     cm_status=0
+     if [ -n "$REQUIRED_M4MACROS" ]; then
+         printbold "Checking for required M4 macros..."
+@@ -265,15 +266,8 @@
+     "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
+ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+ 
+-case $REQUIRED_AUTOMAKE_VERSION in
+-    1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+-    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+-    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+-    1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;;
+-    1.9*) automake_progs="automake-1.9 automake-1.10" ;;
+-    1.10*) automake_progs="automake-1.10" ;;
+-esac
++automake_progs=automake-1.15
++
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
+ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+@@ -389,8 +383,6 @@
+             $AUTOMAKE --gnu --add-missing --copy || exit 1
+         fi
+ 
+-        cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING
+-        cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL
+         rm -f COPYING.autogen_bak INSTALL.autogen_bak
+ 
+         cd "$topdir"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150716/0acf6380/attachment.html>