svn commit: r441765 - head/misc/excel-writer

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri May 26 09:00:39 UTC 2017


Author: amdmi3
Date: Fri May 26 09:00:37 2017
New Revision: 441765
URL: https://svnweb.freebsd.org/changeset/ports/441765

Log:
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/misc/excel-writer/Makefile

Modified: head/misc/excel-writer/Makefile
==============================================================================
--- head/misc/excel-writer/Makefile	Fri May 26 08:50:42 2017	(r441764)
+++ head/misc/excel-writer/Makefile	Fri May 26 09:00:37 2017	(r441765)
@@ -21,8 +21,6 @@ PORTEXAMPLES=	example.gpr excel_out_demo
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${FILESDIR}/biff_dump.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src ${WRKDIR}/data
@@ -34,7 +32,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e "s|Big.xls|${DATADIR}/Big.xls|" \
 		-e 's|\$$Dump\$$|_dump_|g' ${WRKSRC}/extras/biff_dump.adb
-	${REINPLACE_CMD} -e 's/"\(.*\.xls\)"/"\/tmp\/\1"/g' \
+	@${REINPLACE_CMD} -e 's/"\(.*\.xls\)"/"\/tmp\/\1"/g' \
 		${WRKSRC}/excel_out_demo.adb
 
 do-build:
@@ -42,7 +40,7 @@ do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pbiff_dump)
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/excel_writer \
 		${STAGEDIR}${PREFIX}/include/excel_writer \
 		${STAGEDIR}${DATADIR}
@@ -54,15 +52,15 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/excel_writer
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/biff_dump ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/data/Big.xls ${STAGEDIR}${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/excel_writer.txt ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/excel_out_demo.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list