Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

7 files changed, 42 insertions, 58 deletions

diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 5c5d083e78f1..0e0ec33e8237 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ggv2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	ggv-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index 89cfb8add5bf..4ea6114b58fe 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ggv-2.0.1.tar.bz2) = 29aefe42e3f81f9ba65b8e3befb958bd
+MD5 (gnome2/ggv-2.4.0.1.tar.bz2) = 749b7c7f16807dcf924db2475b87f34e
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index e9c10eee9e62..e80c738314b3 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -18,7 +18,7 @@ share/gnome/applications/ggv.desktop
 share/gnome/gnome-2.0/ui/ggv-control-ui.xml
 share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml
 share/gnome/gnome-2.0/ui/ggv-ui.xml
-share/gnome/help/ggv/C/figures/example_screenshot.png
+share/gnome/help/ggv/C/figures/ggv_window.png
 share/gnome/help/ggv/C/ggv.xml
 share/gnome/help/ggv/C/legal.xml
 share/gnome/help/ggv/C/topic.dat
@@ -85,8 +85,10 @@ share/locale/am/LC_MESSAGES/ggv.mo
 share/locale/az/LC_MESSAGES/ggv.mo
 share/locale/be/LC_MESSAGES/ggv.mo
 share/locale/bg/LC_MESSAGES/ggv.mo
+share/locale/bn/LC_MESSAGES/ggv.mo
 share/locale/ca/LC_MESSAGES/ggv.mo
 share/locale/cs/LC_MESSAGES/ggv.mo
+share/locale/cy/LC_MESSAGES/ggv.mo
 share/locale/da/LC_MESSAGES/ggv.mo
 share/locale/de/LC_MESSAGES/ggv.mo
 share/locale/el/LC_MESSAGES/ggv.mo
@@ -125,8 +127,10 @@ share/locale/sk/LC_MESSAGES/ggv.mo
 share/locale/sl/LC_MESSAGES/ggv.mo
 share/locale/sr/LC_MESSAGES/ggv.mo
 share/locale/sr@Latn/LC_MESSAGES/ggv.mo
+share/locale/sq/LC_MESSAGES/ggv.mo
 share/locale/sv/LC_MESSAGES/ggv.mo
 share/locale/ta/LC_MESSAGES/ggv.mo
+share/locale/th/LC_MESSAGES/ggv.mo
 share/locale/tr/LC_MESSAGES/ggv.mo
 share/locale/uk/LC_MESSAGES/ggv.mo
 share/locale/vi/LC_MESSAGES/ggv.mo
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index e20d734538f3..2788c6b22684 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index c1738ce7afdf..c971480b34cd 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-2.2.1.3.tar.bz2) = 36c7db0cd889767a327f118430a13317
+MD5 (gnome2/libgnomeprint-2.3.1.tar.bz2) = 5a755924f0bb2dd0a846a6d02acab058
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
deleted file mode 100644
index fd2c0da7ea23..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- libgnomeprint/transports/Makefile.in.orig	Mon Jun 10 22:16:36 2002
-+++ libgnomeprint/transports/Makefile.in	Mon Jun 10 22:22:35 2002
-@@ -121,7 +121,7 @@
- 
- libgnomeprint_file_la_SOURCES = $(FILE_SRC)
- 
--libgnomeprint_file_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_file_la_LDFLAGS = -avoid-version -module
- 
- libgnomeprint_file_la_LIBADD = 
- 
-@@ -132,7 +132,7 @@
- 
- libgnomeprint_lpr_la_SOURCES = $(LPR_SRC)
- 
--libgnomeprint_lpr_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_lpr_la_LDFLAGS = -avoid-version -module
- 
- libgnomeprint_lpr_la_LIBADD = 
- 
-@@ -143,7 +143,7 @@
- 
- libgnomeprint_custom_la_SOURCES = $(CUSTOM_SRC)
- 
--libgnomeprint_custom_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_custom_la_LDFLAGS = -avoid-version -module
- 
- libgnomeprint_custom_la_LIBADD = 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 1ce047e08b16..c96532fc24e9 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -12,6 +12,7 @@ include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
 include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
 include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
@@ -30,7 +31,7 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.so
-lib/libgnomeprint-2-2.so.0
+lib/libgnomeprint-2-2.so.1
 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a
 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so.0
@@ -38,30 +39,35 @@ lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
 libdata/pkgconfig/libgnomeprint-2.2.pc
-share/doc/libgnomeprint-2.2/index.html
-share/doc/libgnomeprint-2.2/index.sgml
-share/doc/libgnomeprint-2.2/libgnomeprint-building.html
-share/doc/libgnomeprint-2.2/libgnomeprint-compiling.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-master.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print.html
-share/doc/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html
-share/doc/libgnomeprint-2.2/libgnomeprint-question-index.html
-share/doc/libgnomeprint-2.2/libgnomeprint-resources.html
-share/doc/libgnomeprint-2.2/libgnomeprint.html
-share/doc/libgnomeprint-2.2/libgnomeprintunsorted.html
+share/doc/libgnomeprint/home.png
+share/doc/libgnomeprint/index.html
+share/doc/libgnomeprint/index.sgml
+share/doc/libgnomeprint/left.png
+share/doc/libgnomeprint/libgnomeprint-building.html
+share/doc/libgnomeprint/libgnomeprint-compiling.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
+share/doc/libgnomeprint/libgnomeprint-resources.html
+share/doc/libgnomeprint/libgnomeprint.html
+share/doc/libgnomeprint/libgnomeprintunsorted.html
+share/doc/libgnomeprint/right.png
+share/doc/libgnomeprint/up.png
 share/gnome/libgnomeprint/%%VERSION%%/globals.xml
 share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml
 share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml
+share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
+share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml
 share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -70,6 +76,7 @@ share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -106,17 +113,20 @@ share/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/models
 @dirrm share/gnome/libgnomeprint/%%VERSION%%
 @dirrm share/gnome/libgnomeprint
-@dirrm share/doc/libgnomeprint-2.2
+@dirrm share/doc/libgnomeprint
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
 @dirrm lib/libgnomeprint/%%VERSION%%/modules
 @dirrm lib/libgnomeprint/%%VERSION%%