4 files changed, 36 insertions, 26 deletions

diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 62491f8feea4..e0767865de6c 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkam
-PORTVERSION=	0.1.12
-PORTREVISION=	5
+PORTVERSION=	0.1.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -61,13 +60,11 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-g -Wall||g ; \
-		 s|gimpui-1.3|gimpui-2.0|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
+		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|images/gtkam|gtkam/images|g ; \
-		 s|-pedantic||g ; \
-		 s|$$(libdir)/gimp/1.3/|$$(libexecdir)/gimp/2.2/|g'
-	@${ECHO_CMD} "Icon=gtkam.png" >> ${WRKSRC}/gtkam.desktop
+		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo
index 8df24669767b..1b10f99cc824 100644
--- a/graphics/gtkam/distinfo
+++ b/graphics/gtkam/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkam-0.1.12.tar.gz) = 622170d414718a5ae11487a6af1e47cd
-SHA256 (gtkam-0.1.12.tar.gz) = 162c2073a03e2db03a32b9fae847000ae9a5e58a4f1552e8c0fadc7ddc6d3822
-SIZE (gtkam-0.1.12.tar.gz) = 611323
+MD5 (gtkam-0.1.13.tar.gz) = 439449a29dd841c6c44e309d5bd049a3
+SHA256 (gtkam-0.1.13.tar.gz) = 767920d18ac0aae60cb57171defe6ecbae76b1a6d1243da94c7cd7d3e06eb409
+SIZE (gtkam-0.1.13.tar.gz) = 971304
diff --git a/graphics/gtkam/files/patch-Makefile.in b/graphics/gtkam/files/patch-Makefile.in
index 34176d3dbbcc..e1e572f78b96 100644
--- a/graphics/gtkam/files/patch-Makefile.in
+++ b/graphics/gtkam/files/patch-Makefile.in
@@ -1,21 +1,21 @@
---- Makefile.in.orig	Sun Mar  7 07:36:03 2004
-+++ Makefile.in	Sat Mar 20 16:06:19 2004
-@@ -108,7 +108,7 @@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- Makefile.in.orig	Sat Dec 31 08:25:57 2005
++++ Makefile.in	Fri Jan  6 20:18:02 2006
+@@ -251,7 +251,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
++SUBDIRS = m4m art doc $(GNOME_SUBDIRS) packaging pixmaps po src test
+ ACLOCAL_AMFLAGS = -I m4m
  
--SUBDIRS = intl m4  art doc help omf-install packaging pixmaps po src test
-+SUBDIRS = intl m4  art doc $(GNOME_SUBDIRS) packaging pixmaps po src test
+ ########################################################################
+@@ -705,8 +705,7 @@
  
- gtkamdocdir = $(datadir)/doc/gtkam
- gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO
-@@ -412,8 +412,7 @@
- install-exec-am:
- install-exec: install-exec-recursive
+ info-am:
  
 -install-data-am: install-desktopDATA install-gtkamdocDATA \
--		install-iconDATA
+-	install-iconDATA
 +install-data-am:
- install-data: install-data-recursive
  
- install-am: all-am
+ install-exec-am:
+ 
diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist
index 94155c9f29c3..65e033494582 100644
--- a/graphics/gtkam/pkg-plist
+++ b/graphics/gtkam/pkg-plist
@@ -13,7 +13,17 @@ share/gnome/applications/gtkam.desktop
 %%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 %%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 %%GNOME:%%share/gnome/help/gtkam/C/legal.xml
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
+%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
+%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
+%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 %%GNOME:%%share/gnome/omf/gtkam/gtkam-C.omf
+%%GNOME:%%share/gnome/omf/gtkam/gtkam-ru.omf
 share/gnome/pixmaps/gtkam.png
 %%DATADIR%%/images/gtkam-audio.png
 %%DATADIR%%/images/gtkam-camera.png
@@ -35,7 +45,8 @@ share/locale/fr/LC_MESSAGES/gtkam.mo
 share/locale/hu/LC_MESSAGES/gtkam.mo
 share/locale/it/LC_MESSAGES/gtkam.mo
 share/locale/ja/LC_MESSAGES/gtkam.mo
-share/locale/no/LC_MESSAGES/gtkam.mo
+share/locale/nb/LC_MESSAGES/gtkam.mo
+share/locale/pl/LC_MESSAGES/gtkam.mo
 share/locale/pt_BR/LC_MESSAGES/gtkam.mo
 share/locale/pt_PT/LC_MESSAGES/gtkam.mo
 share/locale/ru/LC_MESSAGES/gtkam.mo
@@ -46,6 +57,8 @@ share/locale/uk/LC_MESSAGES/gtkam.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
 %%GNOME:%%@dirrm share/gnome/omf/gtkam
+%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
+%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 %%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 %%GNOME:%%@dirrm share/gnome/help/gtkam/C
 %%GNOME:%%@dirrm share/gnome/help/gtkam