svn commit: r323358 - in head/devel/gnome-common: . files

[Koop Mast]

Author: kwm
Date: Sat Jul 20 20:35:56 2013
New Revision: 323358
URL: http://svnweb.freebsd.org/changeset/ports/323358

Log:
  Add support for automake 1.13 and 1.14.
  
  Submitted by:	Gustau Perez (based on)
  Obtained from:	GNOME dev repo

Added:
  head/devel/gnome-common/files/
  head/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh   (contents, props changed)
Modified:
  head/devel/gnome-common/Makefile

Modified: head/devel/gnome-common/Makefile
==============================================================================
--- head/devel/gnome-common/Makefile	Sat Jul 20 20:17:56 2013	(r323357)
+++ head/devel/gnome-common/Makefile	Sat Jul 20 20:35:56 2013	(r323358)
@@ -1,9 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/devel/gnome-common/Makefile,v 1.20 2012/10/16 08:47:10 kwm Exp $
+#    $MCom: ports/trunk/devel/gnome-common/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-common
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2

Added: head/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh	Sat Jul 20 20:35:56 2013	(r323358)
@@ -0,0 +1,42 @@
+--- macros2/gnome-autogen.sh.orig	2012-10-16 00:58:19.000000000 +0200
++++ macros2/gnome-autogen.sh	2013-07-20 22:13:10.000000000 +0200
+@@ -346,14 +346,16 @@
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
+-    1.12*) automake_progs="automake-1.12" ;;
++    1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.14 automake-1.13" ;;
++    1.14*) automake_progs="automake-1.14" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+@@ -426,6 +428,14 @@
+ 	printbold "Processing $configure_ac"
+ 	cd $dirname
+ 
++	# if the AC_CONFIG_MACRO_DIR() macro is used, create that directory
++	# This is a automake bug fixed in automake 1.13.2
++	# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13514
++	m4dir=`autoconf --trace AC_CONFIG_MACRO_DIR | sed 's,^.*:,,g'`
++	if [ -n "$m4dir" ]; then
++	    mkdir -p $m4dir
++	fi
++
+         # Note that the order these tools are called should match what
+         # autoconf's "autoupdate" package does.  See bug 138584 for
+         # details.