diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-07-21 04:22:31 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-07-21 04:22:31 +0800 |
| commit | c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1 (patch) | |
| tree | 3d4bb3669a6c096d30ed61bee87763b040a12372 /devel | |
| parent | 274fb4e43c482838b46ba4f4fcb161816c4d4976 (diff) | |
| download | marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar.gz marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar.bz2 marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar.lz marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar.xz marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.tar.zst marcuscom-ports-c95f62b64057f0ae89b1ba1a0fc7fa569ed015f1.zip | |
Add support fro automake 1.13 and 1.14. Also add patch to create m4 dirs if
they are not there yet.
Submitted by: Gustau Perez (based on)
Obtained from: GNOME git
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18630 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gnome-common/Makefile | 3 | ||||
| -rw-r--r-- | devel/gnome-common/files/patch-marcros2_gnome-autogen.sh | 42 |
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. |