- Switch to options helpers

- Add missing docs to plist
- Use DATADIR and DOCSDIR in plist, sort

Approved by:	portmgr blanket

2 files changed, 96 insertions, 93 deletions

diff --git a/lang/hope/Makefile b/lang/hope/Makefile
index 1d87fe8fbe89..8074f8890b57 100644
--- a/lang/hope/Makefile
+++ b/lang/hope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hope
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.soi.city.ac.uk/~ross/Hope/
 DISTNAME=	${PORTNAME}
@@ -10,17 +11,13 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Hope is lazy interpreter for HOPE applicative language
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-USE_TEX=	latex:build
-BUILD_DEPENDS+= latex2html:${PORTSDIR}/textproc/latex2html
-MAKE_ARGS+=	WITH_DOCS=yes
-.endif
-
 USES=		gmake
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
+DOCS_USE=		TEX=latex:build
+DOCS_BUILD_DEPENDS=	latex2html:${PORTSDIR}/textproc/latex2html
+DOCS_MAKE_ARGS=		WITH_DOCS=yes
+
 .include <bsd.port.mk>
diff --git a/lang/hope/pkg-plist b/lang/hope/pkg-plist
index 947a8ef15610..784fa0b37cd9 100644
--- a/lang/hope/pkg-plist
+++ b/lang/hope/pkg-plist
@@ -1,85 +1,91 @@
 bin/hope
 man/man1/hope.1.gz
-share/hope/lib.new/Standard.hop
-share/hope/lib/Standard.hop
-share/hope/lib/arith.hop
-share/hope/lib/case.hop
-share/hope/lib/ctype.hop
-share/hope/lib/diag.hop
-share/hope/lib/fold.hop
-share/hope/lib/functions.hop
-share/hope/lib/lines.hop
-share/hope/lib/list.hop
-share/hope/lib/lists.hop
-share/hope/lib/maybe.hop
-share/hope/lib/products.hop
-share/hope/lib/range.hop
-share/hope/lib/seq.hop
-share/hope/lib/set.hop
-share/hope/lib/sort.hop
-share/hope/lib/sums.hop
-share/hope/lib/tree.hop
-share/hope/lib/void.hop
-share/hope/lib/words.hop
-share/hope/lib/y.hop
-%%PORTDOCS%%share/doc/hope/ref_man.dvi.gz
-%%PORTDOCS%%share/doc/hope/ref_man.ps.gz
-%%PORTDOCS%%share/doc/hope/ref_man/index.html
-%%PORTDOCS%%share/doc/hope/ref_man/node1.html
-%%PORTDOCS%%share/doc/hope/ref_man/node10.html
-%%PORTDOCS%%share/doc/hope/ref_man/node11.html
-%%PORTDOCS%%share/doc/hope/ref_man/node12.html
-%%PORTDOCS%%share/doc/hope/ref_man/node13.html
-%%PORTDOCS%%share/doc/hope/ref_man/node14.html
-%%PORTDOCS%%share/doc/hope/ref_man/node15.html
-%%PORTDOCS%%share/doc/hope/ref_man/node16.html
-%%PORTDOCS%%share/doc/hope/ref_man/node17.html
-%%PORTDOCS%%share/doc/hope/ref_man/node2.html
-%%PORTDOCS%%share/doc/hope/ref_man/node3.html
-%%PORTDOCS%%share/doc/hope/ref_man/node4.html
-%%PORTDOCS%%share/doc/hope/ref_man/node5.html
-%%PORTDOCS%%share/doc/hope/ref_man/node6.html
-%%PORTDOCS%%share/doc/hope/ref_man/node7.html
-%%PORTDOCS%%share/doc/hope/ref_man/node8.html
-%%PORTDOCS%%share/doc/hope/ref_man/node9.html
-%%PORTDOCS%%share/doc/hope/ref_man/ref_man.css
-%%PORTDOCS%%share/doc/hope/ref_man/ref_man.html
-%%PORTDOCS%%share/doc/hope/examples.dvi.gz
-%%PORTDOCS%%share/doc/hope/examples.ps.gz
-%%PORTDOCS%%share/doc/hope/examples/examples.css
-%%PORTDOCS%%share/doc/hope/examples/examples.html
-%%PORTDOCS%%share/doc/hope/examples/index.html
-%%PORTDOCS%%share/doc/hope/examples/node1.html
-%%PORTDOCS%%share/doc/hope/examples/node2.html
-%%PORTDOCS%%share/doc/hope/examples/node3.html
-%%PORTDOCS%%share/doc/hope/examples/node4.html
-%%PORTDOCS%%share/doc/hope/hope_tut.dvi.gz
-%%PORTDOCS%%share/doc/hope/hope_tut.ps.gz
-%%PORTDOCS%%share/doc/hope/hope_tut/hope_tut.css
-%%PORTDOCS%%share/doc/hope/hope_tut/hope_tut.html
-%%PORTDOCS%%share/doc/hope/hope_tut/index.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node1.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node10.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node11.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node12.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node13.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node14.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node15.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node16.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node17.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node18.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node19.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node2.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node20.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node21.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node22.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node23.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node24.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node25.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node3.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node4.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node5.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node6.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node7.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node8.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node9.html
+%%DATADIR%%/lib.new/Standard.hop
+%%DATADIR%%/lib/Standard.hop
+%%DATADIR%%/lib/arith.hop
+%%DATADIR%%/lib/case.hop
+%%DATADIR%%/lib/ctype.hop
+%%DATADIR%%/lib/diag.hop
+%%DATADIR%%/lib/fold.hop
+%%DATADIR%%/lib/functions.hop
+%%DATADIR%%/lib/lines.hop
+%%DATADIR%%/lib/list.hop
+%%DATADIR%%/lib/lists.hop
+%%DATADIR%%/lib/maybe.hop
+%%DATADIR%%/lib/products.hop
+%%DATADIR%%/lib/range.hop
+%%DATADIR%%/lib/seq.hop
+%%DATADIR%%/lib/set.hop
+%%DATADIR%%/lib/sort.hop
+%%DATADIR%%/lib/sums.hop
+%%DATADIR%%/lib/tree.hop
+%%DATADIR%%/lib/void.hop
+%%DATADIR%%/lib/words.hop
+%%DATADIR%%/lib/y.hop
+%%PORTDOCS%%%%DOCSDIR%%/examples.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/examples.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/examples/examples.css
+%%PORTDOCS%%%%DOCSDIR%%/examples/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/examples/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/hope_tut.css
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/hope_tut.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/index.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node11.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node12.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node13.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node14.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node15.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node16.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node17.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node18.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node19.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node20.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node21.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node22.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node23.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node24.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node25.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/ref_man.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/internals.pl
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node11.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node12.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node13.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node14.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node15.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node16.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node17.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/ref_man.css
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/ref_man.html