- Use the new options framework

Obtained from:	FreeBSD Haskell

2 files changed, 12 insertions, 12 deletions

diff --git a/lang/whitespace/Makefile b/lang/whitespace/Makefile
index 8462ed529027..5492d207d334 100644
--- a/lang/whitespace/Makefile
+++ b/lang/whitespace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	whitespace
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://compsoc.dur.ac.uk/whitespace/downloads/
 DISTNAME=	wspace-${PORTVERSION}
@@ -26,13 +26,23 @@ WRKSRC=	${WRKDIR}/WSpace
 USE_GMAKE=	yes
 ALL_TARGET=	${TARGET}
 
+OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFAULT=	DOCS EXAMPLES
+
+PORTEXAMPLES=		*
+PORTDOCS=		*
+
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wspace ${PREFIX}/bin
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.endif
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/tutorial.html ${DOCSDIR}
 .endif
diff --git a/lang/whitespace/pkg-plist b/lang/whitespace/pkg-plist
index ee3ec5a10f23..01f5e5987eb6 100644
--- a/lang/whitespace/pkg-plist
+++ b/lang/whitespace/pkg-plist
@@ -1,11 +1 @@
 bin/wspace
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/calc.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/count.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/fact.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/hanoi.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/hworld.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/loctest.ws
-%%PORTDOCS%%%%EXAMPLESDIR%%/name.ws
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%