2 files changed, 121 insertions, 19 deletions

diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 3baf7db4ed05..58537d76bdb0 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	liblqr-1
-# Date created:		30 Jan 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	liblqr-1
 DISTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -18,7 +14,7 @@ COMMENT=	An easy to use C/C++ seam carving library
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 pkgconfig
+USE_GNOME=	_glib20 pkgconfig
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
@@ -26,23 +22,25 @@ USE_LDCONFIG=	yes
 # Use GNU89 inline semantics
 USE_CSTD=	gnu89
 
-.if !defined(NOPORTEXAMPLES)
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	EXAMPLES HTMLDOCS
+HTMLDOCS_DESC=	Build and install HTML documentation
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTSDIR=${PORTSDIR}
 .endif
 
-OPTIONS=	HTMLDOCS	"Build and install HTML documentation"	off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450
-
-PORTDOCS=	*
+PLIST_SUB=	HTMLDOCS=""
+.else
+PLIST_SUB=	HTMLDOCS="@comment "
 .endif
 
 post-patch:
@@ -53,17 +51,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr.*docbookx.dtd|${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd|' \
 		${WRKSRC}/docs/liblqr_manual.docbook
 
+.if ${PORT_OPTIONS:MHTMLDOCS}
 post-build:
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} html
 .endif
 
 post-install:
-.if defined(WITH_HTMLDOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 
@@ -72,4 +70,4 @@ post-install:
 .endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/liblqr-1/pkg-plist b/graphics/liblqr-1/pkg-plist
index d0011700f723..1fa80c9abf1e 100644
--- a/graphics/liblqr-1/pkg-plist
+++ b/graphics/liblqr-1/pkg-plist
@@ -17,3 +17,107 @@ lib/liblqr-1.so.3
 libdata/pkgconfig/lqr-1.pc
 @dirrm include/lqr-1/lqr
 @dirrm include/lqr-1
+%%HTMLDOCS%%%%DOCSDIR%%/Introduction.html
+%%HTMLDOCS%%%%DOCSDIR%%/about-this-doc.html
+%%HTMLDOCS%%%%DOCSDIR%%/api-manual.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-deprecated.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new-0-2.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new-0-3.html
+%%HTMLDOCS%%%%DOCSDIR%%/app-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/attach-images.html
+%%HTMLDOCS%%%%DOCSDIR%%/basic.html
+%%HTMLDOCS%%%%DOCSDIR%%/bias.html
+%%HTMLDOCS%%%%DOCSDIR%%/energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/generate-multi-size.html
+%%HTMLDOCS%%%%DOCSDIR%%/index.html
+%%HTMLDOCS%%%%DOCSDIR%%/lqr.html
+%%HTMLDOCS%%%%DOCSDIR%%/overview.html
+%%HTMLDOCS%%%%DOCSDIR%%/progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/read-out.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-bias.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-carve.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-attach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-bias-add.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-bias-clear.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-cancel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-destroy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-flatten.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-channels.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-col-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-energy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-enl-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-orientation.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-ref-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-ref-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-get-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-init.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-current.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-foreach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-next.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-list-start.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-resize.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-rigmask-add.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-rigmask-clear.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-by-row.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-line.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan-reset.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-scan.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-alpha-channel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-black-channel.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-dump-vmaps.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-energy-function-builtin.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-energy-function.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-enl-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-gradient-function.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-preserve-input-image.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-resize-order.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-side-switch-frequency.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-carver-set-use-cache.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-col-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-image-type.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end-height-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end-width-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-end.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init-height-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init-width-message.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-init.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-update-step.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-progress-set-update.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-ret-val.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-channels.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-radius.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-get-read-t.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-rwindow-read.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-destroy.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-dump.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-data.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-depth.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-height.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-orientation.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-get-width.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-internal-dump.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-current.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-foreach.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-next.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-list-start.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-load.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-lqr-vmap-new.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-pages.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-progress.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-rigmask.html
+%%HTMLDOCS%%%%DOCSDIR%%/ref-vmaps.html
+%%HTMLDOCS%%%%DOCSDIR%%/references.html
+%%HTMLDOCS%%%%DOCSDIR%%/release.html
+%%HTMLDOCS%%%%DOCSDIR%%/rigmask.html
+%%HTMLDOCS%%%%DOCSDIR%%/seam-carve.html
+%%HTMLDOCS%%%%DOCSDIR%%/tuning.html
+%%HTMLDOCS%%%%DOCSDIR%%/vmaps.html
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%