Index: head/graphics/liblqr-1/Makefile
===================================================================
--- head/graphics/liblqr-1/Makefile	(revision 397672)
+++ head/graphics/liblqr-1/Makefile	(revision 397673)
@@ -1,65 +1,55 @@
 # Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
 
 PORTNAME=	liblqr-1
 DISTVERSION=	0.4.1
 PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Easy to use C/C++ seam carving library
 
 USES=		tar:bzip2 gettext gmake pkgconfig libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 # Use GNU89 inline semantics
 USE_CSTD=	gnu89
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES HTMLDOCS
+OPTIONS_SUB=	yes
 HTMLDOCS_DESC=	Build and install HTML documentation
 
-.include <bsd.port.options.mk>
+EXAMPLES_SUB_FILES=	pkg-message
+EXAMPLES_SUB_LIST=	PORTSDIR=${PORTSDIR}
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-SUB_FILES=	pkg-message
-SUB_LIST=	PORTSDIR=${PORTSDIR}
-.endif
+HTMLDOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
-.if ${PORT_OPTIONS:MHTMLDOCS}
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
-PLIST_SUB=	HTMLDOCS=""
-.else
-PLIST_SUB=	HTMLDOCS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^lqr_pkgconfigdir/ s|$$(libdir)|$${exec_prefix}/libdata|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr.*chunk\.xsl|${LOCALBASE}/share/xsl/docbook/html/chunk.xsl|' \
 		${WRKSRC}/docs/lqr_style.xsl
 	@${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:
+post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} html
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MHTMLDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}
-.endif
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-HTMLDOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>