aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-09-23 15:08:15 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-09-23 15:08:15 +0000
commit6829c6d24c8ef599d856a7e9ee8d9725371f9d34 (patch)
tree4f0a46fa0a783dee7055456e7f47127f246733db
parentfba0a2504cc101fb5b8862a55ac013ca16fd3e81 (diff)
downloadports-6829c6d24c8ef599d856a7e9ee8d9725371f9d34.tar.gz
ports-6829c6d24c8ef599d856a7e9ee8d9725371f9d34.zip
Notes
-rw-r--r--devel/gnome-common/Makefile4
-rw-r--r--devel/gnome-common/distinfo4
-rw-r--r--devel/gnome-common/files/patch-marcros2_gnome-autogen.sh42
3 files changed, 3 insertions, 47 deletions
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 47ddbd9bea00..da4b226a825d 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -3,8 +3,7 @@
# $MCom: ports/trunk/devel/gnome-common/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gnome-common
-PORTVERSION= 3.6.0
-PORTREVISION= 1
+PORTVERSION= 3.10.0
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,5 +15,4 @@ USE_XZ= yes
USES= gmake pkgconfig
GNU_CONFIGURE= yes
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 5ce2e2210154..fe0665a6a099 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-common-3.6.0.tar.xz) = e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95
-SIZE (gnome2/gnome-common-3.6.0.tar.xz) = 143636
+SHA256 (gnome2/gnome-common-3.10.0.tar.xz) = aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3
+SIZE (gnome2/gnome-common-3.10.0.tar.xz) = 152440
diff --git a/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh b/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh
deleted file mode 100644
index f8f7e3a43027..000000000000
--- a/devel/gnome-common/files/patch-marcros2_gnome-autogen.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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.