5 files changed, 62 insertions, 75 deletions

diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index 25419be79356..51d3e454c059 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gqview
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gtk20
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -36,8 +37,17 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$prefix/share/doc/gqview-$$VERSION|${DOCSDIR}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|$$(datadir)/doc/gqview-$$(VERSION)/html|${DOCSDIR}/html|g' \
+		${WRKSRC}/doc/Makefile.in
+
 post-install:
+	${MKDIR} ${PREFIX}/share/gnome/apps/Graphics
 	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
+	${MKDIR} ${PREFIX}/share/gnome/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/gqview-devel/distinfo b/graphics/gqview-devel/distinfo
index 913c3f40a0d6..262e06464d4c 100644
--- a/graphics/gqview-devel/distinfo
+++ b/graphics/gqview-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gqview-1.5.6.tar.gz) = b0136da8b13e55d8276d68b5f488aa44
-SIZE(gqview-1.5.6.tar.gz) = 1485907
+MD5 (gqview-1.5.7.tar.gz) = b1e58fd24ecc29457629f9c165d714bb
+SIZE(gqview-1.5.7.tar.gz) = 1283392
diff --git a/graphics/gqview-devel/files/patch-Makefile.in b/graphics/gqview-devel/files/patch-Makefile.in
index 044883ecd662..4bc50ebd9c24 100644
--- a/graphics/gqview-devel/files/patch-Makefile.in
+++ b/graphics/gqview-devel/files/patch-Makefile.in
@@ -1,24 +1,12 @@
 --- Makefile.in.orig	Fri Jan  7 08:33:21 2005
 +++ Makefile.in	Sun Jan  9 22:20:21 2005
-@@ -163,11 +163,7 @@
- readmedir = $(datadir)/gqview
- readme_DATA = README
- 
--desktopdir = $(datadir)/applications
--desktop_DATA = gqview.desktop
- 
--icondir = $(datadir)/pixmaps
--icon_DATA = gqview.png
- 
- ACLOCAL_AMFLAGS = -I m4
- subdir = .
 @@ -637,8 +633,7 @@
  
  info-am:
  
 -install-data-am: install-desktopDATA install-iconDATA install-man \
 -	install-readmeDATA
-+install-data-am: install-desktopDATA install-iconDATA install-man
++install-data-am: install-man
  
  install-exec-am:
  
diff --git a/graphics/gqview-devel/files/patch-configure b/graphics/gqview-devel/files/patch-configure
deleted file mode 100644
index 5da76bcdc267..000000000000
--- a/graphics/gqview-devel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	Fri Feb  6 09:23:28 2004
-+++ configure	Fri Feb  6 09:23:50 2004
-@@ -5844,7 +5844,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GQVIEW_HELPDIR "$prefix/share/gqview"
-+#define GQVIEW_HELPDIR "$prefix/share/doc/gqview"
- _ACEOF
- 
- 
diff --git a/graphics/gqview-devel/pkg-plist b/graphics/gqview-devel/pkg-plist
index a12da850dbb9..666ac7e1fc05 100644
--- a/graphics/gqview-devel/pkg-plist
+++ b/graphics/gqview-devel/pkg-plist
@@ -1,50 +1,51 @@
 bin/gqview
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gqview/help/gnu_fdl.txt
-share/gqview/help/gqview_faq.html
-share/gqview/help/index.html
-share/gqview/help/1_introduction.html
-share/gqview/help/2_main_window.html
-share/gqview/help/2_1_navigation.html
-share/gqview/help/2_2_menus.html
-share/gqview/help/2_3_layout.html
-share/gqview/help/2_4_file_pane.html
-share/gqview/help/2_5_folder_pane.html
-share/gqview/help/2_6_image_pane.html
-share/gqview/help/2_7_status_bar.html
-share/gqview/help/3_other_windows.html
-share/gqview/help/3_1_image_window.html
-share/gqview/help/3_2_image_properties.html
-share/gqview/help/4_image_management.html
-share/gqview/help/4_1_copy_move.html
-share/gqview/help/4_2_rename.html
-share/gqview/help/4_3_delete.html
-share/gqview/help/4_4_external_editing.html
-share/gqview/help/5_image_search.html
-share/gqview/help/5_1_search.html
-share/gqview/help/5_2_finding_duplicates.html
-share/gqview/help/6_collections.html
-share/gqview/help/7_sidebars.html
-share/gqview/help/7_1_exif.html
-share/gqview/help/7_2_sort_manager.html
-share/gqview/help/7_3_keywords.html
-share/gqview/help/8_image_presentation.html
-share/gqview/help/8_1_slideshow.html
-share/gqview/help/8_2_fullscreen.html
-share/gqview/help/9_printing.html
-share/gqview/help/10_options.html
-share/gqview/help/10_1_general.html
-share/gqview/help/10_2_image.html
-share/gqview/help/10_3_window.html
-share/gqview/help/10_4_filtering.html
-share/gqview/help/10_5_editor_commands.html
-share/gqview/help/10_6_advanced.html
-share/gqview/help/10_7_hidden.html
-share/gqview/help/11_reference.html
-share/gqview/help/11_1_command_line.html
-share/gqview/help/11_2_keyboard_shortcuts.html
-share/gqview/help/11_3_thumbnails.html
-share/gqview/help/12_credits.html
+%%DOCSDIR%%/html/gnu_fdl.txt
+%%DOCSDIR%%/html/gqview_faq.html
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/1_introduction.html
+%%DOCSDIR%%/html/2_main_window.html
+%%DOCSDIR%%/html/2_1_navigation.html
+%%DOCSDIR%%/html/2_2_menus.html
+%%DOCSDIR%%/html/2_3_layout.html
+%%DOCSDIR%%/html/2_4_file_pane.html
+%%DOCSDIR%%/html/2_5_folder_pane.html
+%%DOCSDIR%%/html/2_6_image_pane.html
+%%DOCSDIR%%/html/2_7_status_bar.html
+%%DOCSDIR%%/html/3_other_windows.html
+%%DOCSDIR%%/html/3_1_image_window.html
+%%DOCSDIR%%/html/3_2_image_properties.html
+%%DOCSDIR%%/html/4_image_management.html
+%%DOCSDIR%%/html/4_1_copy_move.html
+%%DOCSDIR%%/html/4_2_rename.html
+%%DOCSDIR%%/html/4_3_delete.html
+%%DOCSDIR%%/html/4_4_external_editing.html
+%%DOCSDIR%%/html/5_image_search.html
+%%DOCSDIR%%/html/5_1_search.html
+%%DOCSDIR%%/html/5_2_finding_duplicates.html
+%%DOCSDIR%%/html/6_collections.html
+%%DOCSDIR%%/html/7_sidebars.html
+%%DOCSDIR%%/html/7_1_exif.html
+%%DOCSDIR%%/html/7_2_sort_manager.html
+%%DOCSDIR%%/html/7_3_keywords.html
+%%DOCSDIR%%/html/8_image_presentation.html
+%%DOCSDIR%%/html/8_1_slideshow.html
+%%DOCSDIR%%/html/8_2_fullscreen.html
+%%DOCSDIR%%/html/9_printing.html
+%%DOCSDIR%%/html/10_options.html
+%%DOCSDIR%%/html/10_1_general.html
+%%DOCSDIR%%/html/10_2_image.html
+%%DOCSDIR%%/html/10_3_window.html
+%%DOCSDIR%%/html/10_4_filtering.html
+%%DOCSDIR%%/html/10_5_editor_commands.html
+%%DOCSDIR%%/html/10_6_advanced.html
+%%DOCSDIR%%/html/10_7_hidden.html
+%%DOCSDIR%%/html/11_reference.html
+%%DOCSDIR%%/html/11_1_command_line.html
+%%DOCSDIR%%/html/11_2_keyboard_shortcuts.html
+%%DOCSDIR%%/html/11_3_thumbnails.html
+%%DOCSDIR%%/html/11_4_management.html
+%%DOCSDIR%%/html/12_credits.html
 %%NLS%%share/locale/ar/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gqview.mo
@@ -75,6 +76,5 @@ share/gqview/help/12_credits.html
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
 share/gnome/pixmaps/gqview.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/gqview/help
-@dirrm share/gqview
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%