summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/gnome-common/Makefile3
-rw-r--r--devel/gnome-common/files/patch-marcros2_gnome-autogen.sh42
2 files changed, 44 insertions, 1 deletions
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 23e46c602..b2e5ba6af 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,9 +1,10 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom$
+# $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
diff --git a/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh b/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh
new file mode 100644
index 000000000..f8f7e3a43
--- /dev/null
+++ b/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh
@@ -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.