From owner-svn-ports-head@freebsd.org  Wed Sep 23 23:42:09 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37355A07076;
 Wed, 23 Sep 2015 23:42:09 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DB5912F0;
 Wed, 23 Sep 2015 23:42:09 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8NNg8Ng007507;
 Wed, 23 Sep 2015 23:42:08 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8NNg8Gk007506;
 Wed, 23 Sep 2015 23:42:08 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509232342.t8NNg8Gk007506@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 23 Sep 2015 23:42:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397673 - head/graphics/liblqr-1
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Sep 2015 23:42:09 -0000

Author: amdmi3
Date: Wed Sep 23 23:42:08 2015
New Revision: 397673
URL: https://svnweb.freebsd.org/changeset/ports/397673

Log:
  - Switch to options helpers

Modified:
  head/graphics/liblqr-1/Makefile

Modified: head/graphics/liblqr-1/Makefile
==============================================================================
--- head/graphics/liblqr-1/Makefile	Wed Sep 23 22:59:25 2015	(r397672)
+++ head/graphics/liblqr-1/Makefile	Wed Sep 23 23:42:08 2015	(r397673)
@@ -23,23 +23,15 @@ 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
-
-.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
+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
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^lqr_pkgconfigdir/ s|$$(libdir)|$${exec_prefix}/libdata|' \
@@ -49,17 +41,15 @@ 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:
+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>