2 files changed, 54 insertions, 6 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index d3ce0c5d936c..ebf4bd49d520 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	gqview
 PORTVERSION=	2.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	SFE
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	lme@FreeBSD.org
@@ -34,10 +34,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	README html
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$prefix/share/doc/gqview-$$VERSION|${DOCSDIR}|g' \
 		${WRKSRC}/configure
@@ -46,6 +42,9 @@ post-patch:
 		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's| -r %F||' \
 		${WRKSRC}/gqview.desktop
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|doc$$||' ${WRKSRC}/Makefile.in
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index 2ad19f880edb..a9896421e000 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -1,4 +1,51 @@
 bin/gqview
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/html/10_1_general.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_2_image.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_3_window.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_4_filtering.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_5_editor_commands.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_6_advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_7_hidden.html
+%%PORTDOCS%%%%DOCSDIR%%/html/10_options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/11_1_command_line.html
+%%PORTDOCS%%%%DOCSDIR%%/html/11_2_keyboard_shortcuts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/11_3_thumbnails.html
+%%PORTDOCS%%%%DOCSDIR%%/html/11_4_management.html
+%%PORTDOCS%%%%DOCSDIR%%/html/11_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/12_credits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/1_introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_1_navigation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_2_menus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_3_layout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_4_file_pane.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_5_folder_pane.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_6_image_pane.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_7_status_bar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/2_main_window.html
+%%PORTDOCS%%%%DOCSDIR%%/html/3_1_image_window.html
+%%PORTDOCS%%%%DOCSDIR%%/html/3_2_image_properties.html
+%%PORTDOCS%%%%DOCSDIR%%/html/3_other_windows.html
+%%PORTDOCS%%%%DOCSDIR%%/html/4_1_copy_move.html
+%%PORTDOCS%%%%DOCSDIR%%/html/4_2_rename.html
+%%PORTDOCS%%%%DOCSDIR%%/html/4_3_delete.html
+%%PORTDOCS%%%%DOCSDIR%%/html/4_4_external_editing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/4_image_management.html
+%%PORTDOCS%%%%DOCSDIR%%/html/5_1_search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/5_2_finding_duplicates.html
+%%PORTDOCS%%%%DOCSDIR%%/html/5_image_search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/6_collections.html
+%%PORTDOCS%%%%DOCSDIR%%/html/7_1_exif.html
+%%PORTDOCS%%%%DOCSDIR%%/html/7_2_sort_manager.html
+%%PORTDOCS%%%%DOCSDIR%%/html/7_3_keywords.html
+%%PORTDOCS%%%%DOCSDIR%%/html/7_sidebars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/8_1_slideshow.html
+%%PORTDOCS%%%%DOCSDIR%%/html/8_2_fullscreen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/8_image_presentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/9_printing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gnu_fdl.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/gqview_faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%NLS%%share/locale/ar/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/be/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gqview.mo
@@ -34,3 +81,5 @@ bin/gqview
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
 share/pixmaps/gqview.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%