Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Oct 2012 14:56:44 +0000 (UTC)
From:      Greg Larkin <glarkin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305663 - head/devel/cvsbook
Message-ID:  <201210101456.q9AEui7j048473@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glarkin
Date: Wed Oct 10 14:56:43 2012
New Revision: 305663
URL: http://svn.freebsd.org/changeset/ports/305663

Log:
  - Converted to OptionsNG

Modified:
  head/devel/cvsbook/Makefile

Modified: head/devel/cvsbook/Makefile
==============================================================================
--- head/devel/cvsbook/Makefile	Wed Oct 10 14:51:34 2012	(r305662)
+++ head/devel/cvsbook/Makefile	Wed Oct 10 14:56:43 2012	(r305663)
@@ -15,55 +15,63 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A tutorial and reference for CVS
 
-OPTIONS=	CVSBOOK_INFO		"Install the info version" on \
-		CVSBOOK_SINGLE_HTML	"Install the single-html version" on \
-		CVSBOOK_SPLIT_HTML	"Install the split-html version" off \
-		CVSBOOK_POSTSCRIPT	"Install the postscript version" on \
-		CVSBOOK_PDF		"Install the PDF version" on
+OPTIONS_MULTI=		CVSBOOK
+OPTIONS_MULTI_CVSBOOK=	INFO SINGLE_HTML SPLIT_HTML POSTSCRIPT PDF
+INFO_DESC=		Install the info version
+SINGLE_HTML_DESC=	Install the single HTML version
+SPLIT_HTML_DESC=	Install the split HTML version
+POSTSCRIPT_DESC=	Install the Postscript version
+PDF_DESC=		Install the PDF version
+OPTIONS_DEFAULT=	INFO SINGLE_HTML POSTSCRIPT PDF
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CVSBOOK_SPLIT_HTML)
+.if ${PORT_OPTIONS:MSPLIT_HTML}
 ALL_TARGET=	html-distributed
 .else
 NO_BUILD=	yes
 .endif
 
-.if !defined(WITHOUT_CVSBOOK_INFO)
+.if ${PORT_OPTIONS:MINFO}
 INFO=		cvsbook
 INFODIR=	${PREFIX}/${INFO_PATH}
 INSTALL_INFO?=	install-info
 .endif
-.if !defined(WITHOUT_CVSBOOK_SINGLE_HTML)
+
+.if ${PORT_OPTIONS:MSINGLE_HTML}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.html
 WANT_DOCSDIR=	yes
 .endif
-.if !defined(WITHOUT_CVSBOOK_POSTSCRIPT)
+
+.if ${PORT_OPTIONS:MPOSTSCRIPT}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.ps
 WANT_DOCSDIR=	yes
 .endif
-.if !defined(WITHOUT_CVSBOOK_PDF)
+
+.if ${PORT_OPTIONS:MPDF}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.pdf
 WANT_DOCSDIR=	yes
 .endif
-.if defined(WITH_CVSBOOK_SPLIT_HTML)
+
+.if ${PORT_OPTIONS:MSPLIT_HTML}
 PLIST_DIRS+=	%%DOCSDIR%%/cvsbook-shtml
 WANT_DOCSDIR=	yes
 .endif
+
 .if defined(WANT_DOCSDIR)
 PLIST_DIRS+=	%%DOCSDIR%%
 .endif
 
-.if defined(WITH_CVSBOOK_SPLIT_HTML)
+.if ${PORT_OPTIONS:MSPLIT_HTML}
 post-patch:
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 	'/Non-monolithic HTML not supported/s|@.*|makeinfo --html main.texi|' \
 		${WRKSRC}/Makefile
 .endif
 
-.if defined(WITH_CVSBOOK_SPLIT_HTML)
+.if ${PORT_OPTIONS:MSPLIT_HTML}
 pre-install:
 PLIST_FILES+=	`cd ${WRKSRC}/cvsbook && ${FIND} . -type f| ${CUT} -c2- \
 	| ${SED} 's|^|${DOCSDIR:S,${PREFIX}/,,}/cvsbook-shtml|' \
@@ -74,22 +82,22 @@ do-install:
 .if defined(WANT_DOCSDIR)
 	@${MKDIR} ${DOCSDIR}
 .endif
-.if defined(WITH_CVSBOOK_SPLIT_HTML)
+.if ${PORT_OPTIONS:MSPLIT_HTML}
 	@${MKDIR} ${DOCSDIR}/cvsbook-shtml
 	@cd ${WRKSRC}/cvsbook && ${INSTALL_DATA} -- *.html ${DOCSDIR}/cvsbook-shtml
 .endif
-.if !defined(WITHOUT_CVSBOOK_SINGLE_HTML)
+.if ${PORT_OPTIONS:MSINGLE_HTML}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.html ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_CVSBOOK_PDF)
+.if ${PORT_OPTIONS:MPDF}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.pdf ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_CVSBOOK_POSTSCRIPT)
+.if ${PORT_OPTIONS:MPOSTSCRIPT}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.ps ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_CVSBOOK_INFO)
+.if ${PORT_OPTIONS:MINFO}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.info* ${INFODIR}
 	@${INSTALL_INFO} ${INFODIR}/cvsbook.info ${INFODIR}/dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210101456.q9AEui7j048473>