Date: Thu, 10 Sep 2015 15:24:13 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396577 - in head: databases/couchdb databases/ocaml-mysql databases/postgresql-jdbc databases/py-pg_pqueue databases/tablelog databases/tora deskutils/anamnesis deskutils/gcalcli desku... Message-ID: <201509101524.t8AFODnQ051958@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 10 15:24:12 2015 New Revision: 396577 URL: https://svnweb.freebsd.org/changeset/ports/396577 Log: - Switch to options helpers - Add some NO_ARCHes Approved by: portmgr blanket Modified: head/databases/couchdb/Makefile head/databases/ocaml-mysql/Makefile head/databases/postgresql-jdbc/Makefile head/databases/py-pg_pqueue/Makefile head/databases/tablelog/Makefile head/databases/tora/Makefile head/deskutils/anamnesis/Makefile head/deskutils/gcalcli/Makefile head/deskutils/nagaina/Makefile head/deskutils/phpicalendar/Makefile head/deskutils/zorro/Makefile Modified: head/databases/couchdb/Makefile ============================================================================== --- head/databases/couchdb/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/couchdb/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -70,9 +70,9 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} 's|\(info_file_inst = CouchDB\)$$|\1.info|' \ ${WRKSRC}/share/doc/build/Makefile.in -.if !${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: @${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in -.endif post-configure: # Cater for parallel Spidermonkey v1.7 and v1.8.5 installs by ensuring that Modified: head/databases/ocaml-mysql/Makefile ============================================================================== --- head/databases/ocaml-mysql/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/ocaml-mysql/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -29,18 +29,14 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= htdoc - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/mysql/html/* ${STAGEDIR}${DOCSDIR} -.endif +DOCS_ALL_TARGET= htdoc post-patch: ${REINPLACE_CMD} 's,OCAMLFIND_INSTFLAGS=,OCAMLFIND_INSTFLAGS=-ldconf ignore ,' \ ${WRKSRC}/Makefile.in +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/mysql/html/* ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> Modified: head/databases/postgresql-jdbc/Makefile ============================================================================== --- head/databases/postgresql-jdbc/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/postgresql-jdbc/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -18,26 +18,24 @@ DIST_SUBDIR= postgresql USE_ANT= yes USE_JAVA= yes +NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/postgresql.jar PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message -post-patch: - ${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README - OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - OPTIONS_SUB= yes +post-patch: + ${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README + do-install: - @ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar -.if ${PORT_OPTIONS:MDOCS} + ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/databases/py-pg_pqueue/Makefile ============================================================================== --- head/databases/py-pg_pqueue/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/py-pg_pqueue/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -19,11 +19,8 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/changes.txt ${STAGEDIR}${DOCSDIR} -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/tablelog/Makefile ============================================================================== --- head/databases/tablelog/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/tablelog/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -17,8 +17,6 @@ MAKE_ARGS= USE_PGXS=1 OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql/ @${INSTALL_PROGRAM} ${WRKSRC}/table_log.so \ @@ -26,10 +24,10 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/contrib/ @${INSTALL_DATA} ${WRKSRC}/table_log_init.sql \ ${STAGEDIR}${PREFIX}/share/postgresql/contrib/ -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC} && ${INSTALL_DATA} README.table_log table_log.sql \ ${STAGEDIR}${DOCSDIR}/ -.endif .include <bsd.port.mk> Modified: head/databases/tora/Makefile ============================================================================== --- head/databases/tora/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/databases/tora/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -43,14 +43,11 @@ ORACLE_BUILD_DEPENDS= ${ORACLE_HOME}/lib ORACLE_RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client ORACLE_CONFIGURE_ON= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu} -.include <bsd.port.options.mk> - -post-patch: -.if ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: @${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \ ${PREFIX2FIX:S|^|${WRKSRC}/|} -.else + +post-patch-DOCS-off: @${REINPLACE_CMD} 's|test doc|test|' ${WRKSRC}/Makefile.am -.endif .include <bsd.port.mk> Modified: head/deskutils/anamnesis/Makefile ============================================================================== --- head/deskutils/anamnesis/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/deskutils/anamnesis/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli USES= python PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> +NO_ARCH= yes post-patch: @${REINPLACE_CMD} 's|cfg_files.reverse()|cfg_files += [os.path.join("'${PREFIX}/etc/'",cfg_filename)]; cfg_files.reverse()|' \ @@ -40,10 +39,10 @@ do-install: ${LN} -sf ${PREFIX}/share/anamnesis/anamnesis.py ${STAGEDIR}${PREFIX}/bin/anamnesis ${INSTALL_DATA} ${WRKSRC}/anamnesis.cfg ${STAGEDIR}${PREFIX}/etc/anamnesis.cfg.sample ${INSTALL_MAN} ${WRKSRC}/man/anamnesis.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/deskutils/gcalcli/Makefile ============================================================================== --- head/deskutils/gcalcli/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/deskutils/gcalcli/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -23,6 +23,7 @@ GH_ACCOUNT= insanum USES= python NO_BUILD= yes +NO_ARCH= yes PORTDOCS= README.md gcalcli_?.png @@ -39,14 +40,12 @@ ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPR SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:${PORTSDIR}/devel/py-parsedatetime -.include <bsd.port.options.mk> - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/deskutils/nagaina/Makefile ============================================================================== --- head/deskutils/nagaina/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/deskutils/nagaina/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -39,14 +39,12 @@ DESKTOP_ENTRIES= "Nagaina" \ "Qt;Office;Utility;" \ "true" -.include <bsd.port.options.mk> - post-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/deskutils/phpicalendar/Makefile ============================================================================== --- head/deskutils/phpicalendar/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/deskutils/phpicalendar/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -21,6 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:bz2 NO_BUILD= yes +NO_ARCH= yes USE_PHP= session pcre PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SUB_FILES= pkg-message @@ -30,8 +31,6 @@ PORTDOCS= AUTHORS COPYING README TIMEZON OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} @${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \; @@ -42,9 +41,9 @@ do-install: .for f in caldav.php config.inc.php.sample day.php default_config.php error.php index.php month.php preferences.php print.php search.php week.php year.php @${CP} -v ${WRKSRC}/${f} ${STAGEDIR}${WWWDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/deskutils/zorro/Makefile ============================================================================== --- head/deskutils/zorro/Makefile Thu Sep 10 15:21:12 2015 (r396576) +++ head/deskutils/zorro/Makefile Thu Sep 10 15:24:12 2015 (r396577) @@ -13,15 +13,14 @@ DISTNAME= ${PORTNAME}-1.1p8 MAINTAINER= ports@FreeBSD.org COMMENT= Simple to-do list manager -USES+= tk:run +USES= tk:run NO_BUILD= yes +NO_ARCH= yes PLIST_FILES= bin/zorro PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|/usr/local/bin/wish|${WISH}|' \ ${WRKSRC}/zorro @@ -30,13 +29,11 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zorro ${STAGEDIR}${PREFIX}/bin/zorro -.if ${PORT_OPTIONS:MDOCS} -post-install: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${STAGEDIR}${DOCSDIR}/ @${ECHO_MSG} "" @${ECHO_MSG} "Take a look at ${STAGEDIR}${DOCSDIR}/DOTzorrorc" @${ECHO_MSG} "" -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509101524.t8AFODnQ051958>