5 files changed, 8 insertions, 83 deletions

diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 92bd2df9068b..60f970093b82 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,24 +1,18 @@
-# New ports collection makefile for:	gnomecommon
-# Date created:				04 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/devel/gnome-common/Makefile,v 1.15 2009/09/26 13:41:58 marcus Exp $
-#
+#    $MCom: ports/devel/gnome-common/Makefile,v 1.20 2012/10/16 08:47:10 kwm Exp $
 
 PORTNAME=	gnome-common
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	3.6.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Common automake macros for GNOME and GNOME 2
+COMMENT=	Common automake macros for GNOME 2 and GNOME 3
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 0b1846f20689..5ce2e2210154 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-common-2.28.0.tar.bz2) = dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
-SIZE (gnome2/gnome-common-2.28.0.tar.bz2) = 151535
+SHA256 (gnome2/gnome-common-3.6.0.tar.xz) = e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95
+SIZE (gnome2/gnome-common-3.6.0.tar.xz) = 143636
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh
deleted file mode 100644
index 5a2716d05123..000000000000
--- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1fed4ee7015b89a1ac4c4a535aeb753e820e4970 Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Sun, 29 Apr 2012 17:44:32 +0000
-Subject: Add support for automake 1.12
-
-Bug #675093.
----
-diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
-index 9967f89..3179c3f 100644
---- macros2/gnome-autogen.sh
-+++ macros2/gnome-autogen.sh
-@@ -325,13 +325,14 @@ 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.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.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
--    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
--    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
--    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
--    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
--    1.11*) automake_progs="automake-1.11" ;;
-+    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" ;;
- esac
- version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
---
-cgit v0.9.0.2
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
deleted file mode 100644
index dc6703919abe..000000000000
--- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=427432
-https://bugzilla.gnome.org/show_bug.cgi?id=680363
-
---- ./macros2/gnome-autogen.sh.orig	2009-05-27 23:29:07.000000000 +0200
-+++ ./macros2/gnome-autogen.sh	2012-07-24 10:29:13.064750613 +0200
-@@ -77,6 +77,7 @@
-     vc_min_version=$4
-     vc_source=$5
-     vc_status=1
-+    vc_option="--version"
- 
-     vc_checkprog=`eval echo "\\$$vc_variable"`
-     if [ -n "$vc_checkprog" ]; then
-@@ -89,11 +90,19 @@
-     else
- 	vc_comparator=">="
-     fi
-+    # The most reliable way to check pkg-config version is to query the actual
-+    # virtual
-+    # pkg-config package entry's modversion.  This works in all known
-+    # implementations.
-+
-+    if test "x$vc_package" = "xpkg-config"; then
-+	vc_option="--modversion pkg-config"
-+    fi
-     printbold "checking for $vc_package $vc_comparator $vc_min_version..."
-     for vc_checkprog in $vc_checkprogs; do
- 	echo $ECHO_N "  testing $vc_checkprog... " $ECHO_C
--	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
--	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-+	if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then
-+	    vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \
-                                sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
- 	    if compare_versions $vc_min_version $vc_actual_version; then
- 		echo "found $vc_actual_version"
diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist
index 081a3d75ee4c..eb75c41be53e 100644
--- a/devel/gnome-common/pkg-plist
+++ b/devel/gnome-common/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-autogen.sh
 bin/gnome-doc-common
+share/aclocal/gnome-code-coverage.m4
 share/aclocal/gnome-common.m4
 share/aclocal/gnome-compiler-flags.m4
 %%DATADIR%%/data/omf.make