Add gthumb2 after repo-copy from gthumb. gthumb2 is an image browser and

viewer for the GNOME 2 desktop.

Submitted by:	Maxime Romano <verbophobe@hotmail.com> (with added
		modifications)

7 files changed, 72 insertions, 66 deletions

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 1e7d67474a10..997fa4d8819f 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -1,23 +1,28 @@
-# New ports collection makefile for:	gThumb
-# Date created:				03 Nov 2001
-# Whom:					Harald Schmalzbauer <H@Schmalzbauer.de>
+# New ports collection makefile for:	gThumb2
+# Date created:				17 Aug 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gthumb
-PORTVERSION=	0.13
+PORTNAME=	gthumb2
+PORTVERSION=	1.103
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gthumb
+DISTNAME=	gthumb-${PORTVERSION}
 
-MAINTAINER=	H@Schmalzbauer.de
+MAINTAINER=	verbophobe@hotmail.com
+
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade gnomevfs
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	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 b39e4d715691..93b7a810f079 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gthumb-0.13.tar.gz) = 9b4e7dec57035b3ed6c70bbc5991c152
+MD5 (gthumb-1.103.tar.gz) = a4aa28538f079200e0625b89af1b1d68
diff --git a/graphics/gthumb2/files/patch-libgthumb_image-list.c b/graphics/gthumb2/files/patch-libgthumb_image-list.c
new file mode 100644
index 000000000000..8cff4816517f
--- /dev/null
+++ b/graphics/gthumb2/files/patch-libgthumb_image-list.c
@@ -0,0 +1,10 @@
+--- 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/files/patch-libgthumb_image-viewer.c b/graphics/gthumb2/files/patch-libgthumb_image-viewer.c
new file mode 100644
index 000000000000..d01b73b9e054
--- /dev/null
+++ b/graphics/gthumb2/files/patch-libgthumb_image-viewer.c
@@ -0,0 +1,10 @@
+--- libgthumb/image-viewer.c.orig	Sun Aug 18 00:36:59 2002
++++ libgthumb/image-viewer.c	Sun Aug 18 00:37:08 2002
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <math.h>
++#include <sys/types.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkadjustment.h>
+ #include <gtk/gtkhscrollbar.h>
diff --git a/graphics/gthumb2/pkg-comment b/graphics/gthumb2/pkg-comment
index 729781a28cd8..a4be5a424edc 100644
--- a/graphics/gthumb2/pkg-comment
+++ b/graphics/gthumb2/pkg-comment
@@ -1 +1 @@
-An image viewer and browser for the GNOME environment
+An image viewer and browser for the GNOME 2 environment
diff --git a/graphics/gthumb2/pkg-descr b/graphics/gthumb2/pkg-descr
index efa489cdf58a..4d1d8cc31d28 100644
--- a/graphics/gthumb2/pkg-descr
+++ b/graphics/gthumb2/pkg-descr
@@ -1,8 +1,5 @@
-This is a port of gThumb, a fast and small image browser and viewer.
+This is a port of gThumb for GNOME 2, a fast and small image browser and viewer.
 It creates thumbnailes, caches them and has support for most popular
 image formats.
 
 WWW: http://gthumb.sourceforge.net/
-
--Harry
-H@Schmalzbauer.de
diff --git a/graphics/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index bb9910370514..3fd033ba203b 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -1,62 +1,46 @@
 bin/gthumb
-bin/gthumb-image-viewer
+libdata/bonobo/servers/GNOME_GThumb_Viewer.server
+libexec/gthumb-image-viewer
 share/gnome/application-registry/gthumb.applications
-share/gnome/apps/Graphics/gthumb.desktop
-share/gnome/gthumb/glade/gthumb.glade
-share/gnome/gthumb/glade/gthumb_comments.glade
-share/gnome/gthumb/glade/gthumb_png_exporter.glade
-share/gnome/gthumb/glade/gthumb_print.glade
-share/gnome/gthumb/glade/gthumb_search.glade
-share/gnome/gthumb/glade/gthumb_search_edit.glade
+share/gnome/applications/gthumb.desktop
+share/gnome/gnome-2.0/ui/GNOME_GThumb_Viewer.xml
+share/gnome/gnome-2.0/ui/gthumb-ui.xml
+share/gnome/gthumb/glade/gthumb.glade2
+share/gnome/gthumb/glade/gthumb_comments.glade2
+share/gnome/gthumb/glade/gthumb_png_exporter.glade2
+share/gnome/gthumb/glade/gthumb_print.glade2
+share/gnome/gthumb/glade/gthumb_search.glade2
+share/gnome/gthumb/glade/gthumb_tools.glade2
+share/gnome/gthumb/icons/flip.png
 share/gnome/gthumb/icons/flip.xpm
+share/gnome/gthumb/icons/mirror.png
 share/gnome/gthumb/icons/mirror.xpm
+share/gnome/gthumb/icons/rotate.png
 share/gnome/gthumb/icons/rotate.xpm
-share/gnome/help/gthumb/C/authors.html
-share/gnome/help/gthumb/C/browsing.html
-share/gnome/help/gthumb/C/bugs.html
-share/gnome/help/gthumb/C/catalogs.html
-share/gnome/help/gthumb/C/comments.html
-share/gnome/help/gthumb/C/create-index-image.html
-share/gnome/help/gthumb/C/docbook.css
-share/gnome/help/gthumb/C/find.html
-share/gnome/help/gthumb/C/images/find-images.gif
-share/gnome/help/gthumb/C/images/search-progress.gif
-share/gnome/help/gthumb/C/images/search-result.gif
-share/gnome/help/gthumb/C/index.html
-share/gnome/help/gthumb/C/intro.html
-share/gnome/help/gthumb/C/license.html
-share/gnome/help/gthumb/C/ln11.html
-share/gnome/help/gthumb/C/printing.html
-share/gnome/help/gthumb/C/shortcuts.html
-share/gnome/help/gthumb/C/tools.html
-share/gnome/help/gthumb/C/topic.dat
-share/gnome/help/gthumb/C/viewing.html
-share/gnome/help/gthumb/C/wallpaper.html
-share/gnome/help/gthumb/ru/authors.html
-share/gnome/help/gthumb/ru/bugs.html
-share/gnome/help/gthumb/ru/index.html
-share/gnome/help/gthumb/ru/license.html
-share/gnome/help/gthumb/ru/ln10.html
-share/gnome/help/gthumb/ru/shortcuts.html
-share/gnome/help/gthumb/ru/topic.dat
-share/gnome/oaf/GNOME_GThumb_Viewer.oaf
+share/gnome/help/gthumb/C/figures/comment.png
+share/gnome/help/gthumb/C/figures/dlg-comment.png
+share/gnome/help/gthumb/C/figures/find-images.png
+share/gnome/help/gthumb/C/figures/main-win.png
+share/gnome/help/gthumb/C/figures/nav-button.png
+share/gnome/help/gthumb/C/figures/preferences.png
+share/gnome/help/gthumb/C/figures/search-progress.png
+share/gnome/help/gthumb/C/figures/search-result.png
+share/gnome/help/gthumb/C/gthumb.xml
+share/gnome/help/gthumb/C/legal.xml
+share/gnome/omf/gthumb/gthumb-C.omf
 share/gnome/pixmaps/gthumb.png
-share/gnome/ui/GNOME_GThumb_Viewer.xml
-share/locale/de/LC_MESSAGES/gthumb.mo
-share/locale/es/LC_MESSAGES/gthumb.mo
-share/locale/fr/LC_MESSAGES/gthumb.mo
-share/locale/it/LC_MESSAGES/gthumb.mo
-share/locale/ja/LC_MESSAGES/gthumb.mo
-share/locale/ko/LC_MESSAGES/gthumb.mo
-share/locale/nl/LC_MESSAGES/gthumb.mo
-share/locale/pt_BR/LC_MESSAGES/gthumb.mo
-share/locale/ru/LC_MESSAGES/gthumb.mo
-share/locale/sv/LC_MESSAGES/gthumb.mo
-@exec mkdir -p %D/share/gnome/help/gthumb/ru/images 2>/dev/null || true
-@exec mkdir -p %D/share/gnome/help/gthumb/C/images 2>/dev/null || true
-@dirrm share/gnome/help/gthumb/ru/images
-@dirrm share/gnome/help/gthumb/ru
-@dirrm share/gnome/help/gthumb/C/images
+share/locale/de/LC_MESSAGES/gthumb-2.0.mo
+share/locale/es/LC_MESSAGES/gthumb-2.0.mo
+share/locale/fr/LC_MESSAGES/gthumb-2.0.mo
+share/locale/it/LC_MESSAGES/gthumb-2.0.mo
+share/locale/ja/LC_MESSAGES/gthumb-2.0.mo
+share/locale/ko/LC_MESSAGES/gthumb-2.0.mo
+share/locale/nl/LC_MESSAGES/gthumb-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gthumb-2.0.mo
+share/locale/ru/LC_MESSAGES/gthumb-2.0.mo
+share/locale/sv/LC_MESSAGES/gthumb-2.0.mo
+@dirrm share/gnome/omf/gthumb
+@dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
 @dirrm share/gnome/gthumb/icons