Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

6 files changed, 76 insertions, 24 deletions

diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 42bcf7c518cf..39c60932a447 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gpdf
-PORTVERSION=	0.112.1
+PORTVERSION=	0.131
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.112
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -17,7 +17,7 @@ COMMENT=	GNOME version of xpdf
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack libgnomeui libgnomeprintui
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo
index 72d883063770..d29f76dc6d0f 100644
--- a/graphics/gpdf/distinfo
+++ b/graphics/gpdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gpdf-0.112.1.tar.bz2) = 67cad1ac559b4403cbc0c5a3fb1b327f
-SIZE (gnome2/gpdf-0.112.1.tar.bz2) = 839517
+MD5 (gnome2/gpdf-0.131.tar.bz2) = 95eeb0a33d37fbb5c56cf9260656d86d
+SIZE (gnome2/gpdf-0.131.tar.bz2) = 1101285
diff --git a/graphics/gpdf/files/patch-configure b/graphics/gpdf/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/graphics/gpdf/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc
new file mode 100644
index 000000000000..78e0b8155d02
--- /dev/null
+++ b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc
@@ -0,0 +1,10 @@
+--- xpdf/gpdf-thumbnails-view.cc.orig	Wed Jan 14 00:09:05 2004
++++ xpdf/gpdf-thumbnails-view.cc	Wed Jan 14 00:09:34 2004
+@@ -21,6 +21,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <sys/types.h>
+ #include <gpdf-g-switch.h>
+ #  include <glib.h>
+ #  include <glib/ghash.h>
diff --git a/graphics/gpdf/pkg-descr b/graphics/gpdf/pkg-descr
index 4d967a66f364..d1735f2c2c76 100644
--- a/graphics/gpdf/pkg-descr
+++ b/graphics/gpdf/pkg-descr
@@ -1,6 +1,6 @@
 The GNOME PDF Viewer is an open source viewer for Portable Document
-Format (PDF) files.   (These are also sometimes called "Acrobat" files,
-from the name of Adobe's PDF software.)  The GNOME PDF viewer is based
-upon xpdf (ports/graphics/xpdf).
+Format (PDF) files, often called "Acrobat" files, from the name of
+Adobe's PDF software.  The GNOME PDF viewer is based upon xpdf, and
+integrates directly into the GNOME 2 desktop.
 
 WWW: http://www.gnome.org
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index 94812e1b38e7..77cdfd5d65a3 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -1,16 +1,45 @@
 bin/gpdf
+etc/gconf/gconf.xml.defaults/apps/gpdf/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gpdf/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows/%gconf.xml
+etc/gconf/schemas/gpdf.schemas
 libdata/bonobo/servers/GNOME_PDF.server
 libexec/gnome-pdf-viewer
-share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade
-share/gnome/gpdf/glade/gpdf-properties-dialog.glade
-share/gnome/pixmaps/gpdf/fitwidth.png
-share/gnome/pixmaps/gnome-pdf.png
+share/gnome/application-registry/gpdf.applications
+share/gnome/applications/gpdf.desktop
 share/gnome/gnome-2.0/ui/gpdf-control-ui.xml
 share/gnome/gnome-2.0/ui/gpdf-window-ui.xml
-share/gnome/applications/gpdf.desktop
+share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade
+share/gnome/gpdf/glade/gpdf-properties-dialog.glade
+share/gnome/help/gpdf/C/figures/gpdf_start_window.png
+share/gnome/help/gpdf/C/figures/gpdf_window.png
+share/gnome/help/gpdf/C/gpdf.xml
+share/gnome/help/gpdf/C/legal.xml
+share/gnome/help/gpdf/de/figures/gpdf_window.png
+share/gnome/help/gpdf/de/gpdf.xml
+share/gnome/help/gpdf/de/legal.xml
+share/gnome/help/gpdf/es/figures/gpdf_start_window.png
+share/gnome/help/gpdf/es/gpdf.xml
+share/gnome/help/gpdf/es/legal.xml
 share/gnome/mime-info/gpdf.keys
-share/gnome/application-registry/gpdf.applications
+share/gnome/omf/gpdf/gpdf-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gpdf/gpdf-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gpdf/gpdf-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/gnome-pdf.png
+share/gnome/pixmaps/gpdf/fitwidth.png
+share/gnome/pixmaps/gpdf/stock_book-closed-mark.png
+share/gnome/pixmaps/gpdf/stock_book-closed.png
+share/gnome/pixmaps/gpdf/stock_book-opened-mark.png
+share/gnome/pixmaps/gpdf/stock_book-opened.png
+share/gnome/pixmaps/gpdf/stock_bookmarks.png
 share/locale/am/LC_MESSAGES/gpdf.mo
+share/locale/ar/LC_MESSAGES/gpdf.mo
 share/locale/az/LC_MESSAGES/gpdf.mo
 share/locale/be/LC_MESSAGES/gpdf.mo
 share/locale/bn/LC_MESSAGES/gpdf.mo
@@ -20,15 +49,19 @@ share/locale/cy/LC_MESSAGES/gpdf.mo
 share/locale/da/LC_MESSAGES/gpdf.mo
 share/locale/de/LC_MESSAGES/gpdf.mo
 share/locale/el/LC_MESSAGES/gpdf.mo
+share/locale/en_CA/LC_MESSAGES/gpdf.mo
+share/locale/en_GB/LC_MESSAGES/gpdf.mo
 share/locale/eo/LC_MESSAGES/gpdf.mo
 share/locale/es/LC_MESSAGES/gpdf.mo
 share/locale/eu/LC_MESSAGES/gpdf.mo
+share/locale/fa/LC_MESSAGES/gpdf.mo
 share/locale/fi/LC_MESSAGES/gpdf.mo
 share/locale/fr/LC_MESSAGES/gpdf.mo
 share/locale/ga/LC_MESSAGES/gpdf.mo
 share/locale/gl/LC_MESSAGES/gpdf.mo
 share/locale/he/LC_MESSAGES/gpdf.mo
 share/locale/hi/LC_MESSAGES/gpdf.mo
+share/locale/hr/LC_MESSAGES/gpdf.mo
 share/locale/hu/LC_MESSAGES/gpdf.mo
 share/locale/id/LC_MESSAGES/gpdf.mo
 share/locale/is/LC_MESSAGES/gpdf.mo
@@ -45,12 +78,14 @@ share/locale/ms/LC_MESSAGES/gpdf.mo
 share/locale/nl/LC_MESSAGES/gpdf.mo
 share/locale/nn/LC_MESSAGES/gpdf.mo
 share/locale/no/LC_MESSAGES/gpdf.mo
+share/locale/pa/LC_MESSAGES/gpdf.mo
 share/locale/pl/LC_MESSAGES/gpdf.mo
 share/locale/pt/LC_MESSAGES/gpdf.mo
 share/locale/pt_BR/LC_MESSAGES/gpdf.mo
 share/locale/ro/LC_MESSAGES/gpdf.mo
 share/locale/ru/LC_MESSAGES/gpdf.mo
 share/locale/sk/LC_MESSAGES/gpdf.mo
+share/locale/sl/LC_MESSAGES/gpdf.mo
 share/locale/sq/LC_MESSAGES/gpdf.mo
 share/locale/sr/LC_MESSAGES/gpdf.mo
 share/locale/sr@Latn/LC_MESSAGES/gpdf.mo
@@ -64,5 +99,22 @@ share/locale/wa/LC_MESSAGES/gpdf.mo
 share/locale/zh_CN/LC_MESSAGES/gpdf.mo
 share/locale/zh_TW/LC_MESSAGES/gpdf.mo
 @dirrm share/gnome/pixmaps/gpdf
+@dirrm share/gnome/omf/gpdf
+@dirrm share/gnome/help/gpdf/es/figures
+@dirrm share/gnome/help/gpdf/es
+@dirrm share/gnome/help/gpdf/de/figures
+@dirrm share/gnome/help/gpdf/de
+@dirrm share/gnome/help/gpdf/C/figures
+@dirrm share/gnome/help/gpdf/C
+@dirrm share/gnome/help/gpdf
 @dirrm share/gnome/gpdf/glade
 @dirrm share/gnome/gpdf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true