Update to 3.10.0:

    version 3.10.0

    compiler-flags: Add a #serial line

    As suggested in bug #707475, this will ensure the latest version of
    gnome-compiler-flags.m4 is used if conflicting versions are found in
    different directories in the autoconf search path.

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=707475


    compiler-flags: Add an optional second argument for custom warnings

    This allows module authors to choose to enforce stricter warnings on
    a per-module basis, to avoid the situation where an outside
    contributor submits a patch which introduces warnings the maintainer
    has enabled locally.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=707475


    Run intltool before autoreconf so intltool.m4 is picked up by aclocal.
    https://bugzilla.gnome.org/show_bug.cgi?id=705365


    gnome-autogen.sh: run glib-gettexize if using GLib gettext

    This code was removed by error in
    commit 323bbfe0989405725379cada1aa5cb361fd2999f


    gnome-autogen.sh: Check only for autoreconf

    autoconf, automake, libtool, gettext are already checked by autoreconf


    Rename configure.in to configure.ac


    gnome-autogen: Do not use sed to get the AC_CONFIG_MACRO_DIR directory


    macros2/gnome-autogen.sh: Create m4 directory if it doesnt exits

    This is a automake bug fixed in automake 1.13.2


    gnome-autogen.sh: Use autoreconf

    instead autopoint/libtoolize/autoconf/automake manually


    Add support for automake 1.14


    code-coverage: fix conditionalization

    The "make clean" rule added by gnome-code-coverage.m4 was not
    conditionalized (making it spew errors on "make clean" when built
    without coverage support, since $(LCOV) expanded to ""), and the other
    rules were conditionalized incorrectly (testing "ifdef
    CODE_COVERAGE_ENABLED", when that variable was always set, just
    sometimes to "no"). Fix both problems.

    https://bugzilla.gnome.org/show_bug.cgi?id=699943


    Add support for lcov 1.10


    version 3.7.4


    COPYING: add GPL-2 license file

    Finally declare gnome-common to be GPL 2+, by doing some source code
    archaeology.

    These files we can effectively ignore:

    .gitignore
    AUTHORS
    ChangeLog.pre-git
    NEWS
    README
    doc-build/README
    doc/usage.txt
    gnome-common.doap
    macros2/README.cvs-commits

    The build files you could argue are boilerplate/uncopyrightable:

    Makefile.am
    autogen.sh
    configure.in
    doc-build/Makefile.am
    macros2/Makefile.am

    So that leaves:

    doc-build/gnome-doc-common.in
    doc-build/omf.make
    doc-build/xmldocs.make

    Appeared in e16ea58db92e05b9720acdc6992175ec346dfc91. Appears to have
    been copy-pasted from scrollkeeper-example2, LGPLv2.1.

    macros2/gnome-autogen.sh

    Can be traced back to gnome-libs 88f7376472d3ee54329213c118b46225703d8223, which
    is GPLv2/LGPLv2.

    macros2/gnome-code-coverage.m4

    LGPLv2.1+.

    macros2/gnome-common.m4
    macros2/gnome-compiler-flags.m4

    Synced with gnome-core as of 425e5cc9aad003c9f64d43f2d3f15e04a97db854, so
    LGPLv2.1+.

    The long-standing assumption is that gnome-common was GPLv2+, so use that
    license. Finally the tyranny of unclear licensing is over!

    https://bugzilla.gnome.org/show_bug.cgi?id=133689


    build: remove useless (empty or ancient) files that we don't need


    Add support for automake 1.13.


    Better support of using AUTOCONF environment variable

    When I launch gnome-autogen.sh by telling it to use a version of
    autoconf that is at a particular path -- by using the AUTOCONF
    environment variable -- I can see that there is a spot in the script
    that fails to honour that variable.  I thus get the error message
    (that I trim to just keep the relevant part):

        AUTOCONF=/my/autoconf AUTOM4TE=/my/autom4te /bin/sh -x /usr/bin/gnome-autogen.sh

        [...]

        +++ find_configure_files /home/dodji/devel/git/gdl/master
        +++ configure_ac=
        +++ test -f /home/dodji/devel/git/gdl/master/configure.ac
        +++ test -f /home/dodji/devel/git/gdl/master/configure.in
        +++ configure_ac=/home/dodji/devel/git/gdl/master/configure.in
        +++ test x/home/dodji/devel/git/gdl/master/configure.in '!=' x
        +++ echo /home/dodji/devel/git/gdl/master/configure.in
        +++ autoconf -t 'AC_CONFIG_SUBDIRS:$1' /home/dodji/devel/git/gdl/master/configure.in
        +++ read dir
        /home/dodji/devel/git/gdl/master/configure.in:8: error: Autoconf version 2.65 or higher is required
        /home/dodji/devel/git/gdl/master/configure.in:8: the top level
        autom4te: /bin/m4 failed with exit status: 63

    I think the problem is that the find_configure_files function uses
    'autoconf' directly instead of using $AUTOCONF.  So it's taking the
    autoconf binary that is in my path, and that one doesn't satisfy the
    version requirement of the configure.in script template that is in.
    /home/dodji/devel/git/gdl/master/configure.in.

    The patch below fixes that essentially by s/autoconf/$AUTOCONF there,
    and also by moving the definition point of the AUTOCONF variable --
    that is done by a call to version_check -- before the first spot that
    actually uses it.

    It's worth noting that this bug appears to have been introduced by the
    patch attached to bug #510713.

    Tested on my Fedora Rawhide system.

    	* macros2/gnome-autogen.sh (find_configure_files): Use the
    	AUTOCONF variable, rather than calling the autoconf program
    	directly.  Remove the now useless comment.
    	(<at global scope>): Move the definition of the AUTOCONF variable
    	before its first use.


    compiler-warnings: Fix tabs->spaces

    Per https://bugzilla.gnome.org/show_bug.cgi?id=688192


    compiler-warnings: Drop -Wdeclaration-after-statement

    Some GNOME modules want the ability to use C99, let's not hamper them.

    https://bugzilla.gnome.org/show_bug.cgi?id=688192


    compiler-warnings: Drop -Wno-sign-comare

    It's not part of -Wall, and we're not explicitly turning it on here,
    so there's no point in turning it off, since it's not on.

    Additionally, if a given module did want it on, it's clearer if
    the compiler flags don't have -Wno-sign-compare -Wsign-compare.

    https://bugzilla.gnome.org/show_bug.cgi?id=688192


    compiler-warnings: Move -Wnested-externs to the always-on warning set

    Since there's no reason to have it different for yes/maximum.

    https://bugzilla.gnome.org/show_bug.cgi?id=688192


    compiler-warnings: code cleanup: Extract common warnings into variables

    Will make future refactoring clearer, and also we have comments now.

    https://bugzilla.gnome.org/show_bug.cgi?id=688192


    compiler-warnings: Drop -Waggregate-return

    This trips up gnome-desktop using things like XSyncValue, and while
    it's possible to avoid, we shouldn't punish people who are pushed to
    use structures as return values by external APIs.

    Returning a two-element structure is not a big deal.


    compiler-warnings: cosmetic cleanup: Put each warning on own line

    So that further patches are more readable.


    Add lots of warnings to GNOME_COMPILE_WARNINGS

    Following Colin Walters' thread on desktop-devel-list:

    https://mail.gnome.org/archives/desktop-devel-list/2012-July/msg00100.html

    Add a selection of more strict warnings to the default level of
    GNOME_COMPILE_WARNINGS. Check all the warnings by passing them to GCC,
    and ignore those which fail. Set the severity of some of the warnings to
    errors, so that particularly bad code is rejected (set the warning level
    to ‘minimum’ is you wish to avoid this behaviour). Fixes bug 568546 and
    bug 608953.


    code-coverage: Relicence to LGPLv2.1+

    As gnome-common is widely used, it’s useful for it to have a fairly liberal
    licence. This relicences the gnome-code-coverage.m4 file from GPLv3+ to
    LGPLv2.1+.

    Permission has been obtained (by private e-mail) from the other contributors:
     • Christian Persch <chpe@gnome.org>
     • Xan Lopez <xan@gnome.org>

    See also: https://bugzilla.gnome.org/show_bug.cgi?id=133689


    code coverage: Quiet lcov and add extra ignore patterns

    Make lcov be quiet if V=0, and add a new CODE_COVERAGE_IGNORE_PATTERN
    variable to be able to add extra files to ignore in code coverage reporting.


    Post release version bump

3 files changed, 7 insertions, 40 deletions

diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 4136decffeb..b204f0a596d 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2013/07/04 12:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/11/26 14:19:51 wiz Exp $
 
-DISTNAME=	gnome-common-3.6.0
-PKGREVISION=	2
+DISTNAME=	gnome-common-3.10.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-common/3.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-common/3.10/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 076a0e38bc9..bfceef47de9 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2013/07/04 12:05:26 wiz Exp $
+$NetBSD: distinfo,v 1.13 2013/11/26 14:19:51 wiz Exp $
 
-SHA1 (gnome-common-3.6.0.tar.xz) = 63a99fb27f8288595d516ee927929036312a86e1
-RMD160 (gnome-common-3.6.0.tar.xz) = 6c672c672f7e1ec437375b88f05acdda9c5ccf17
-Size (gnome-common-3.6.0.tar.xz) = 143636 bytes
-SHA1 (patch-macros2_gnome-autogen.sh) = 73d54fa4c87527ea754edcc4d9de96d05ca66b63
+SHA1 (gnome-common-3.10.0.tar.xz) = e44fffbe5ba9926e43b716cf57263d9294d3080d
+RMD160 (gnome-common-3.10.0.tar.xz) = da2a76865667cb8d4665fb5ada8ec4c09bfdd386
+Size (gnome-common-3.10.0.tar.xz) = 152440 bytes
diff --git a/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh b/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh
deleted file mode 100644
index 275b6024526..00000000000
--- a/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-macros2_gnome-autogen.sh,v 1.2 2013/07/04 12:05:26 wiz Exp $
-
-Add automake-1.13 support.
-
---- macros2/gnome-autogen.sh.orig	2012-10-15 22:58:19.000000000 +0000
-+++ macros2/gnome-autogen.sh
-@@ -346,14 +346,16 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoc
- 
- 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"