Update to 2.1.0.

Approved by:	maintainer

5 files changed, 96 insertions, 18 deletions

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 719a69ac5e0f..1a40c4f38e44 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,24 +6,26 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gthumb
-DISTNAME=	gthumb-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	verbophobe@hotmail.com
 COMMENT=	An image viewer and browser for the GNOME 2 environment
 
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20
+		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index bcdd779515fa..2bbc08f13023 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gthumb-2.0.1.tar.gz) = 608fa80b3ea6b8de0c4ae5c89005b85e
+MD5 (gnome2/gthumb-2.1.0.tar.bz2) = 3b69bf98c7fac4b08288ba206b5230ba
diff --git a/graphics/gthumb2/files/patch-configure b/graphics/gthumb2/files/patch-configure
new file mode 100644
index 000000000000..f195f07b43c6
--- /dev/null
+++ b/graphics/gthumb2/files/patch-configure
@@ -0,0 +1,10 @@
+--- 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/gthumb2/files/patch-libgthumb_image-list.c b/graphics/gthumb2/files/patch-libgthumb_image-list.c
deleted file mode 100644
index 8cff4816517f..000000000000
--- a/graphics/gthumb2/files/patch-libgthumb_image-list.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgthumb/image-list.c.orig	Sun Aug 18 00:36:36 2002
-+++ libgthumb/image-list.c	Sun Aug 18 00:36:47 2002
-@@ -46,6 +46,7 @@
- #include <config.h>
- #include <string.h>
- #include <stdio.h>
-+#include <sys/types.h>
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtkadjustment.h>
- #include <gtk/gtksignal.h>
diff --git a/graphics/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index 2efcd666bc60..e97b3ed581d3 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -8,6 +8,7 @@ etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/rename_series/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/tga_saver/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/tiff_saver/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/web_album/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/exporter/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/exporter/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/exporter/page/%gconf.xml
@@ -25,6 +26,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/rename_series/%gconf.xm
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/tga_saver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/tiff_saver/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/web_album/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter/page/%gconf.xml
@@ -34,6 +36,12 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/slideshow/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/ui/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/viewer/%gconf.xml
 etc/gconf/schemas/gthumb.schemas
+lib/gthumb/modules/libduplicates.so
+lib/gthumb/modules/libjpegtran.so
+lib/gthumb/modules/libpngexporter.so
+lib/gthumb/modules/libsearch.so
+lib/gthumb/modules/libwebexporter.so
+lib/libgthumb.so
 libdata/bonobo/servers/GNOME_GThumb_CatalogView.server
 libdata/bonobo/servers/GNOME_GThumb_Viewer.server
 libexec/gthumb-catalog-view
@@ -43,6 +51,63 @@ share/gnome/applications/gthumb.desktop
 share/gnome/gnome-2.0/ui/GNOME_GThumb_CatalogView.xml
 share/gnome/gnome-2.0/ui/GNOME_GThumb_Viewer.xml
 share/gnome/gnome-2.0/ui/gthumb-ui.xml
+share/gnome/gthumb/albumthemes/Classic/1.gif
+share/gnome/gthumb/albumthemes/Classic/back.png
+share/gnome/gthumb/albumthemes/Classic/background.gif
+share/gnome/gthumb/albumthemes/Classic/bot.png
+share/gnome/gthumb/albumthemes/Classic/image.gthtml
+share/gnome/gthumb/albumthemes/Classic/index.gthtml
+share/gnome/gthumb/albumthemes/Classic/left.png
+share/gnome/gthumb/albumthemes/Classic/next.png
+share/gnome/gthumb/albumthemes/Classic/prev.png
+share/gnome/gthumb/albumthemes/Classic/right.png
+share/gnome/gthumb/albumthemes/Classic/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/Classic/top.png
+share/gnome/gthumb/albumthemes/ClassicClips/1.gif
+share/gnome/gthumb/albumthemes/ClassicClips/back.png
+share/gnome/gthumb/albumthemes/ClassicClips/background.gif
+share/gnome/gthumb/albumthemes/ClassicClips/bot.png
+share/gnome/gthumb/albumthemes/ClassicClips/image.gthtml
+share/gnome/gthumb/albumthemes/ClassicClips/index.gthtml
+share/gnome/gthumb/albumthemes/ClassicClips/left.png
+share/gnome/gthumb/albumthemes/ClassicClips/next.png
+share/gnome/gthumb/albumthemes/ClassicClips/prev.png
+share/gnome/gthumb/albumthemes/ClassicClips/right.png
+share/gnome/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/ClassicClips/top.png
+share/gnome/gthumb/albumthemes/NeatRound/1.gif
+share/gnome/gthumb/albumthemes/NeatRound/back.png
+share/gnome/gthumb/albumthemes/NeatRound/background.gif
+share/gnome/gthumb/albumthemes/NeatRound/bot.png
+share/gnome/gthumb/albumthemes/NeatRound/image.gthtml
+share/gnome/gthumb/albumthemes/NeatRound/index.gthtml
+share/gnome/gthumb/albumthemes/NeatRound/left.png
+share/gnome/gthumb/albumthemes/NeatRound/next.png
+share/gnome/gthumb/albumthemes/NeatRound/prev.png
+share/gnome/gthumb/albumthemes/NeatRound/right.png
+share/gnome/gthumb/albumthemes/NeatRound/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/NeatRound/top.png
+share/gnome/gthumb/albumthemes/NeatSquare/1.gif
+share/gnome/gthumb/albumthemes/NeatSquare/back.png
+share/gnome/gthumb/albumthemes/NeatSquare/background.gif
+share/gnome/gthumb/albumthemes/NeatSquare/bot.png
+share/gnome/gthumb/albumthemes/NeatSquare/image.gthtml
+share/gnome/gthumb/albumthemes/NeatSquare/index.gthtml
+share/gnome/gthumb/albumthemes/NeatSquare/left.png
+share/gnome/gthumb/albumthemes/NeatSquare/next.png
+share/gnome/gthumb/albumthemes/NeatSquare/prev.png
+share/gnome/gthumb/albumthemes/NeatSquare/right.png
+share/gnome/gthumb/albumthemes/NeatSquare/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/NeatSquare/top.png
+share/gnome/gthumb/albumthemes/Simple/1.gif
+share/gnome/gthumb/albumthemes/Simple/first.gif
+share/gnome/gthumb/albumthemes/Simple/image.gthtml
+share/gnome/gthumb/albumthemes/Simple/index.gthtml
+share/gnome/gthumb/albumthemes/Simple/last.gif
+share/gnome/gthumb/albumthemes/Simple/next.gif
+share/gnome/gthumb/albumthemes/Simple/prev.gif
+share/gnome/gthumb/albumthemes/Simple/thumbnail.gthtml
+share/gnome/gthumb/albumthemes/Simple/up.gif
 share/gnome/gthumb/glade/gthumb.glade
 share/gnome/gthumb/glade/gthumb_comments.glade
 share/gnome/gthumb/glade/gthumb_convert.glade
@@ -52,6 +117,7 @@ share/gnome/gthumb/glade/gthumb_preferences.glade
 share/gnome/gthumb/glade/gthumb_print.glade
 share/gnome/gthumb/glade/gthumb_search.glade
 share/gnome/gthumb/glade/gthumb_tools.glade
+share/gnome/gthumb/glade/gthumb_web_exporter.glade
 share/gnome/gthumb/icons/black-white.png
 share/gnome/gthumb/icons/flip.png
 share/gnome/gthumb/icons/flip.xpm
@@ -73,6 +139,7 @@ share/gnome/omf/gthumb/gthumb-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gthumb/gthumb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gthumb.png
 share/locale/am/LC_MESSAGES/gthumb.mo
+share/locale/ca/LC_MESSAGES/gthumb.mo
 share/locale/cs/LC_MESSAGES/gthumb.mo
 share/locale/da/LC_MESSAGES/gthumb.mo
 share/locale/de/LC_MESSAGES/gthumb.mo
@@ -89,13 +156,20 @@ share/locale/pt_BR/LC_MESSAGES/gthumb.mo
 share/locale/ru/LC_MESSAGES/gthumb.mo
 share/locale/sv/LC_MESSAGES/gthumb.mo
 share/locale/zh_TW/LC_MESSAGES/gthumb.mo
-@dirrm share/gnome/pixmaps
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
 @dirrm share/gnome/gthumb/icons
 @dirrm share/gnome/gthumb/glade
+@dirrm share/gnome/gthumb/albumthemes/Simple
+@dirrm share/gnome/gthumb/albumthemes/NeatSquare
+@dirrm share/gnome/gthumb/albumthemes/NeatRound
+@dirrm share/gnome/gthumb/albumthemes/ClassicClips
+@dirrm share/gnome/gthumb/albumthemes/Classic
+@dirrm share/gnome/gthumb/albumthemes
 @dirrm share/gnome/gthumb
+@dirrm lib/gthumb/modules
+@dirrm lib/gthumb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/viewer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/ui
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/slideshow
@@ -104,6 +178,7 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter/page
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter/general
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/exporter
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/web_album
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/tiff_saver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/tga_saver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image
@@ -121,6 +196,7 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/exporter/page
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/exporter/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/exporter
+@dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/web_album
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/tiff_saver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/tga_saver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image