6 files changed, 44 insertions, 20 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 64ae5e42160d..1e7d67474a10 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gthumb
-PORTVERSION=	0.9.9
+PORTVERSION=	0.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gthumb
@@ -15,18 +15,16 @@ MAINTAINER=	H@Schmalzbauer.de
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack libglade gnomevfs
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gthumb.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 211b7513ca68..b39e4d715691 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1 +1 @@
-MD5 (gthumb-0.9.9.tar.gz) = 8b96bb0dde7adaf3b9d01b6c2bd4b0cb
+MD5 (gthumb-0.13.tar.gz) = 9b4e7dec57035b3ed6c70bbc5991c152
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index 8aebc9b96736..bb9910370514 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -1,5 +1,6 @@
 bin/gthumb
 bin/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
@@ -11,12 +12,26 @@ share/gnome/gthumb/icons/flip.xpm
 share/gnome/gthumb/icons/mirror.xpm
 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/ln7.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
@@ -24,7 +39,6 @@ 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/mime-info/gthumb.keys
 share/gnome/oaf/GNOME_GThumb_Viewer.oaf
 share/gnome/pixmaps/gthumb.png
 share/gnome/ui/GNOME_GThumb_Viewer.xml
diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 64ae5e42160d..1e7d67474a10 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gthumb
-PORTVERSION=	0.9.9
+PORTVERSION=	0.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gthumb
@@ -15,18 +15,16 @@ MAINTAINER=	H@Schmalzbauer.de
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack libglade gnomevfs
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gthumb.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index 211b7513ca68..b39e4d715691 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gthumb-0.9.9.tar.gz) = 8b96bb0dde7adaf3b9d01b6c2bd4b0cb
+MD5 (gthumb-0.13.tar.gz) = 9b4e7dec57035b3ed6c70bbc5991c152
diff --git a/graphics/gthumb2/pkg-plist b/graphics/gthumb2/pkg-plist
index 8aebc9b96736..bb9910370514 100644
--- a/graphics/gthumb2/pkg-plist
+++ b/graphics/gthumb2/pkg-plist
@@ -1,5 +1,6 @@
 bin/gthumb
 bin/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
@@ -11,12 +12,26 @@ share/gnome/gthumb/icons/flip.xpm
 share/gnome/gthumb/icons/mirror.xpm
 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/ln7.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
@@ -24,7 +39,6 @@ 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/mime-info/gthumb.keys
 share/gnome/oaf/GNOME_GThumb_Viewer.oaf
 share/gnome/pixmaps/gthumb.png
 share/gnome/ui/GNOME_GThumb_Viewer.xml