- Update to 2.3.0

- Add optional dependency on libgphoto2 (enables Import pictures in File menu)
- Use lthack

Submitted by:	Koop Mast <kwm@rainbow-runner.nl> (based on)

4 files changed, 23 insertions, 15 deletions

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index cd03c6480d3f..95bbe5e5fd1c 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,7 +19,7 @@ COMMENT=	An image viewer and browser for the GNOME 2 environment
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack lthack libgnomeui libgnomeprintui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -33,4 +33,8 @@ MAN1=		gthumb.1
 LIB_DEPENDS+=	exif.10:${PORTSDIR}/graphics/libexif
 .endif
 
+.if defined(WITH_GPHOTO2) || exists(${LOCALBASE}/lib/libgphoto2.so.2)
+LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index 16df2fdcc39d..5abd93e93383 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gthumb-2.2.0.tar.bz2) = 8292dc34f5152c4462c4e6b88184e6eb
+MD5 (gnome2/gthumb-2.3.0.tar.bz2) = b51d70307704e7782d38beadde11481b
diff --git a/graphics/gthumb2/files/patch-configure b/graphics/gthumb2/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/graphics/gthumb2/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/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index 692f91295277..15563bdc00ed 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -3,8 +3,10 @@ etc/gconf/gconf.xml.defaults/apps/gthumb/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/browser/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/convert_format/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/crop/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/jpeg_saver/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/messages/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/photo_importer/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/rename_series/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image/%gconf.xml
@@ -24,8 +26,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/browser/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/convert_format/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/crop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/jpeg_saver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/messages/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/photo_importer/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/rename_series/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image/%gconf.xml
@@ -45,6 +49,7 @@ etc/gconf/schemas/gthumb.schemas
 lib/gthumb/libgthumb.so
 lib/gthumb/modules/libduplicates.so
 lib/gthumb/modules/libjpegtran.so
+lib/gthumb/modules/libphotoimporter.so
 lib/gthumb/modules/libpngexporter.so
 lib/gthumb/modules/libsearch.so
 lib/gthumb/modules/libwebexporter.so
@@ -57,8 +62,8 @@ 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/BlueStripes/background.png
 share/gnome/gthumb/albumthemes/BlueStripes/back.png
+share/gnome/gthumb/albumthemes/BlueStripes/background.png
 share/gnome/gthumb/albumthemes/BlueStripes/bottom.png
 share/gnome/gthumb/albumthemes/BlueStripes/image.gthtml
 share/gnome/gthumb/albumthemes/BlueStripes/index.gthtml
@@ -131,9 +136,13 @@ 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/glade/ftp-client-48.png
+share/gnome/gthumb/glade/gphoto-48.png
 share/gnome/gthumb/glade/gthumb.glade
+share/gnome/gthumb/glade/gthumb_camera.glade
 share/gnome/gthumb/glade/gthumb_comments.glade
 share/gnome/gthumb/glade/gthumb_convert.glade
+share/gnome/gthumb/glade/gthumb_crop.glade
 share/gnome/gthumb/glade/gthumb_edit.glade
 share/gnome/gthumb/glade/gthumb_png_exporter.glade
 share/gnome/gthumb/glade/gthumb_preferences.glade
@@ -141,6 +150,7 @@ 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/glade/volume-mute.png
 share/gnome/gthumb/icons/black-white.png
 share/gnome/gthumb/icons/flip.png
 share/gnome/gthumb/icons/flip.xpm
@@ -220,8 +230,10 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/scale_image
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/rename_series
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/photo_importer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/messages
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/jpeg_saver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/crop
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs/convert_format
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/browser
@@ -241,8 +253,10 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/scale_image
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/rename_series
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/photo_importer
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/messages
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/jpeg_saver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/crop
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs/convert_format
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gthumb/browser