Update to 2.4.0:

2003-10-02  Malcolm Tredinnick <malcolm@commsecure.com.au>

	* doc-build/Makefile.am: Distribute README in place of the
	non-existent ChangeLog. Doh!

	* autogen.sh: Use the GNOME 2 autogen.sh script by default.
	* configure.in: Version number bumped.

2003-08-23  Marco Pesenti Gritti  <marco@gnome.org>

	* macros2/compiler-flags.m4:

	Define WARN_CXXFLAGS instead of overwriting
	CXXFLAGS (like WARN_FLAGS).

2003-07-04  Frederic Crozat  <fcrozat@mandrakesoft.com>

	* macros2/compiler-flags.m4: don't use -Wsign-promo, it is
	C++ only and causes warnings with gcc 3.3 when used on C.

2003-06-24  Marco Pesenti Gritti  <marco@it.gnome.org>

	* macros2/autogen.sh:

	Remove --enable-compile-warnings from the default arguments
	passed to configure because it break GNOME_COMPILE_WARNINGS
	macro.

2003-05-24  Malcolm Tredinnick <malcolm@commsecure.com.au>

	* MAINTAINERS: Put myself in as maintainer.

	* configure.in: Bump the version number to 2.3.0

	* configure.in, Makefile.am, macros2/autogen.sh, doc-build/*:
	Add in the infrastructure to allow user documentatin to be built
	from some common files. This will not affect existing packages.
	The changes required to use this are given in doc-build/README.

2003-02-26  Frederic Crozat  <fcrozat@mandrakesoft.com>

	* macros2/autogen.sh: set WANT_AUTOCONF_2_5 variable to tell
	Mandrake autoconf wrapper we want to check if autoconf 2.5x is here..

2003-02-18  Jody Goldberg <jody@gnome.org>

	* configure.in : Don't depend on a file that James just deleted

2002-12-12  Jody Goldberg <jody@gnome.org>

	* macros2/gnome-common.m4 (GNOME_DEBUG_CHECK) : now that autoconf-2.52
	  is a prereq for things the build broke on the use of
	      AC_DEFINE(GNOME_ENABLE_DEBUG)
	  without the additional arguments.

4 files changed, 24 insertions, 25 deletions

diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 01344787f3c..0390678cc51 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:30:49 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/10 14:39:40 jmmv Exp $
 #
 
-DISTNAME=	gnome-common-1.2.4
+DISTNAME=	gnome-common-2.4.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-common/1.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-common/2.4/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Generic M4 macros for GNOME development
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnome-common/PLIST b/devel/gnome-common/PLIST
index 3cc28ac078e..ad614a51b31 100644
--- a/devel/gnome-common/PLIST
+++ b/devel/gnome-common/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/21 11:31:36 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/10 14:39:40 jmmv Exp $
 bin/gnome-autogen.sh
+bin/gnome-doc-common
 share/aclocal/gnome-macros/aclocal-include.m4
 share/aclocal/gnome-macros/autogen.sh
 share/aclocal/gnome-macros/compiler-flags.m4
@@ -15,6 +16,7 @@ share/aclocal/gnome-macros/gnome-libgtop-check.m4
 share/aclocal/gnome-macros/gnome-macros.dep
 share/aclocal/gnome-macros/gnome-objc-checks.m4
 share/aclocal/gnome-macros/gnome-orbit-check.m4
+share/aclocal/gnome-macros/gnome-pilot.m4
 share/aclocal/gnome-macros/gnome-print-check.m4
 share/aclocal/gnome-macros/gnome-pthread-check.m4
 share/aclocal/gnome-macros/gnome-support.m4
@@ -27,17 +29,14 @@ share/aclocal/gnome-macros/gperf-check.m4
 share/aclocal/gnome-macros/linger.m4
 share/aclocal/gnome-macros/need-declaration.m4
 share/aclocal/gnome2-macros/autogen.sh
-share/aclocal/gnome2-macros/check-utmp.m4
 share/aclocal/gnome2-macros/compiler-flags.m4
 share/aclocal/gnome2-macros/curses.m4
 share/aclocal/gnome2-macros/gnome-common.m4
-share/aclocal/gnome2-macros/gnome-cxx-check.m4
-share/aclocal/gnome2-macros/gnome-gettext.m4
-share/aclocal/gnome2-macros/gnome-pkgconfig.m4
-share/aclocal/gnome2-macros/gnome-platform.m4
-share/aclocal/gnome2-macros/gnome-pthread-check.m4
-share/aclocal/gnome2-macros/gnome-x-checks.m4
+share/aclocal/gnome2-macros/gnome-deprecated-macros.m4
 share/aclocal/gnome2-macros/gnome2-macros.dep
-share/aclocal/gnome2-macros/linger.m4
+share/gnome-common/data/omf.make
+share/gnome-common/data/xmldocs.make
+@dirrm share/gnome-common/data
+@dirrm share/gnome-common
 @dirrm share/aclocal/gnome2-macros
 @dirrm share/aclocal/gnome-macros
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index a2c92edbda1..baa2b5f8dbb 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/21 11:31:36 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/02/10 14:39:40 jmmv Exp $
 
-SHA1 (gnome-common-1.2.4.tar.gz) = 56dd1155e952f54582344d4c32a64bd4cb73755b
-Size (gnome-common-1.2.4.tar.gz) = 214003 bytes
-SHA1 (patch-aa) = c2d8df529884f1d76c9f529fa19ed59ff0944ed9
+SHA1 (gnome-common-2.4.0.tar.gz) = 9908d32fcd0581a6928487ea24a75a14e43ba0a8
+Size (gnome-common-2.4.0.tar.gz) = 222370 bytes
+SHA1 (patch-aa) = 88d45862065f4b5637643dcc4f0c7e14121ae11e
diff --git a/devel/gnome-common/patches/patch-aa b/devel/gnome-common/patches/patch-aa
index a5307b7bc73..bed85525c5c 100644
--- a/devel/gnome-common/patches/patch-aa
+++ b/devel/gnome-common/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/21 11:31:36 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/10 14:39:40 jmmv Exp $
 
---- configure.orig	2003-02-21 12:28:56.000000000 +0100
+--- configure.orig	2004-02-10 15:00:22.000000000 +0100
 +++ configure
-@@ -7098,6 +7098,7 @@ fi
-   test -n "$AWK" && break
+@@ -7779,6 +7779,7 @@ fi
  done
  
+ 
 +if false; then
  # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
- echo "$as_me:7103: checking for $ac_word" >&5
-@@ -7146,6 +7147,7 @@ echo "$as_me: error:
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -7829,6 +7830,7 @@ echo "$as_me: error:
  *** <http://www.freedesktop.org/software/pkgconfig/>." >&2;}
     { (exit 1); exit 1; }; }
  fi
 +fi
  
- ac_config_files="$ac_config_files Makefile gnome-common.spec macros/Makefile macros2/Makefile bin/Makefile doc/Makefile"
- cat >confcache <<\_ACEOF
+ 
+ ac_config_files="$ac_config_files Makefile gnome-common.spec macros/Makefile macros2/Makefile bin/Makefile doc/Makefile doc-build/Makefile doc-build/gnome-doc-common"