- HTML files are needed by the GUI built-in documentation system and shall

  not depend on NOPORTDOCS.

Reported by:	Ports Fury (via private e-mail)

4 files changed, 46 insertions, 42 deletions

diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index c88ae4f9490f..bbde45eefc97 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qtpfsgui
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -23,23 +24,24 @@ LIB_DEPENDS=	exiv2.3:${PORTSDIR}/graphics/exiv2 \
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui imageformats \
 		linguist_build moc_build qmake_build rcc_build uic_build
+INSTALL_TARGET=	install_target install_menu install_icon install_i18n
 INSTALLS_ICONS=	yes
 
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
+.if !defined(NOPORTOOCS)
+INSTALL_TARGET+=install_htmls
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^QMAKE_CXXFLAGS/d ; \
-		 s|PREFIX =.*$$|PREFIX = ${PREFIX}|g ; \
-		 /^INSTALLS/s|docs||g' ${WRKSRC}/project.pro
+		 s|PREFIX =.*$$|PREFIX = ${PREFIX}|g' ${WRKSRC}/project.pro
 .for file in src/MainWindow/mainWindow.cpp \
 	src/Preferences/preferencesDialog.cpp \
 	src/TransplantExif/transplant.cpp
-	@${REINPLACE_CMD} -e 's|/usr/local/share/qtpfsgui/|${DATADIR}/|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/share/qtpfsgui/|${DOCSDIR}/|g' \
 		${WRKSRC}/${file}
 .endfor
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '316s|htmls||' ${WRKSRC}/project.pro
-.endif
 
 do-configure:
 	@${LRELEASE} ${WRKSRC}/project.pro
diff --git a/graphics/luminance/pkg-plist b/graphics/luminance/pkg-plist
index 8b4c9224abfa..c42af2e5a484 100644
--- a/graphics/luminance/pkg-plist
+++ b/graphics/luminance/pkg-plist
@@ -6,21 +6,21 @@ share/icons/hicolor/48x48/apps/qtpfsgui.png
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/html/dcraw.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hints.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/batch-1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/copy_exif.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/mainwin.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/projectiveTransformationDialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/raw_conversion.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/resize.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_4.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_5.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_6.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tonemapdialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%DOCSDIR%%/html/dcraw.html
+%%DOCSDIR%%/html/faq.html
+%%DOCSDIR%%/html/hints.html
+%%DOCSDIR%%/html/images/batch-1.jpg
+%%DOCSDIR%%/html/images/copy_exif.jpeg
+%%DOCSDIR%%/html/images/mainwin.jpeg
+%%DOCSDIR%%/html/images/projectiveTransformationDialog.jpeg
+%%DOCSDIR%%/html/images/raw_conversion.jpg
+%%DOCSDIR%%/html/images/resize.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_4.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_5.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_6.jpeg
+%%DOCSDIR%%/html/images/tonemapdialog.jpeg
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/manual.html
 %%DATADIR%%/i18n/lang_cs.qm
 %%DATADIR%%/i18n/lang_de.qm
 %%DATADIR%%/i18n/lang_es.qm
diff --git a/graphics/qtpfsgui/Makefile b/graphics/qtpfsgui/Makefile
index c88ae4f9490f..bbde45eefc97 100644
--- a/graphics/qtpfsgui/Makefile
+++ b/graphics/qtpfsgui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qtpfsgui
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -23,23 +24,24 @@ LIB_DEPENDS=	exiv2.3:${PORTSDIR}/graphics/exiv2 \
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui imageformats \
 		linguist_build moc_build qmake_build rcc_build uic_build
+INSTALL_TARGET=	install_target install_menu install_icon install_i18n
 INSTALLS_ICONS=	yes
 
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
+.if !defined(NOPORTOOCS)
+INSTALL_TARGET+=install_htmls
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^QMAKE_CXXFLAGS/d ; \
-		 s|PREFIX =.*$$|PREFIX = ${PREFIX}|g ; \
-		 /^INSTALLS/s|docs||g' ${WRKSRC}/project.pro
+		 s|PREFIX =.*$$|PREFIX = ${PREFIX}|g' ${WRKSRC}/project.pro
 .for file in src/MainWindow/mainWindow.cpp \
 	src/Preferences/preferencesDialog.cpp \
 	src/TransplantExif/transplant.cpp
-	@${REINPLACE_CMD} -e 's|/usr/local/share/qtpfsgui/|${DATADIR}/|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/share/qtpfsgui/|${DOCSDIR}/|g' \
 		${WRKSRC}/${file}
 .endfor
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '316s|htmls||' ${WRKSRC}/project.pro
-.endif
 
 do-configure:
 	@${LRELEASE} ${WRKSRC}/project.pro
diff --git a/graphics/qtpfsgui/pkg-plist b/graphics/qtpfsgui/pkg-plist
index 8b4c9224abfa..c42af2e5a484 100644
--- a/graphics/qtpfsgui/pkg-plist
+++ b/graphics/qtpfsgui/pkg-plist
@@ -6,21 +6,21 @@ share/icons/hicolor/48x48/apps/qtpfsgui.png
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/html/dcraw.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hints.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/batch-1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/copy_exif.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/mainwin.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/projectiveTransformationDialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/raw_conversion.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/resize.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_4.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_5.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_6.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tonemapdialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%DOCSDIR%%/html/dcraw.html
+%%DOCSDIR%%/html/faq.html
+%%DOCSDIR%%/html/hints.html
+%%DOCSDIR%%/html/images/batch-1.jpg
+%%DOCSDIR%%/html/images/copy_exif.jpeg
+%%DOCSDIR%%/html/images/mainwin.jpeg
+%%DOCSDIR%%/html/images/projectiveTransformationDialog.jpeg
+%%DOCSDIR%%/html/images/raw_conversion.jpg
+%%DOCSDIR%%/html/images/resize.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_4.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_5.jpeg
+%%DOCSDIR%%/html/images/snap-qt4_6.jpeg
+%%DOCSDIR%%/html/images/tonemapdialog.jpeg
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/manual.html
 %%DATADIR%%/i18n/lang_cs.qm
 %%DATADIR%%/i18n/lang_de.qm
 %%DATADIR%%/i18n/lang_es.qm