From owner-svn-ports-head@freebsd.org Thu Jan 11 18:09:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83EEFE72E37; Thu, 11 Jan 2018 18:09:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A0927D4B4; Thu, 11 Jan 2018 18:09:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73020186BE; Thu, 11 Jan 2018 18:09:02 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BI92u5053784; Thu, 11 Jan 2018 18:09:02 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BI90p4053764; Thu, 11 Jan 2018 18:09:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201801111809.w0BI90p4053764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 11 Jan 2018 18:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458761 - in head: benchmarks/httperf biology/velvet comms/tio databases/pgbarman databases/powerarchitect deskutils/showdown devel/api-sanity-autotest devel/git-modes devel/gtkparasite... X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head: benchmarks/httperf biology/velvet comms/tio databases/pgbarman databases/powerarchitect deskutils/showdown devel/api-sanity-autotest devel/git-modes devel/gtkparasite devel/jsmin devel/libaur... X-SVN-Commit-Revision: 458761 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2018 18:09:03 -0000 Author: danfe Date: Thu Jan 11 18:09:00 2018 New Revision: 458761 URL: https://svnweb.freebsd.org/changeset/ports/458761 Log: - Convert to option helper install target (add OPTIONS_DEFINE=DOCS when it was missing) - Invoke INSTALL_DATA where appropriate instead of INSTALL_MAN - Fix some whitespace and formatting bugs along the way Modified: head/benchmarks/httperf/Makefile head/biology/velvet/Makefile head/comms/tio/Makefile head/databases/pgbarman/Makefile head/databases/powerarchitect/Makefile head/deskutils/showdown/Makefile head/devel/api-sanity-autotest/Makefile head/devel/git-modes/Makefile head/devel/gtkparasite/Makefile head/devel/jsmin/Makefile head/devel/libaura/Makefile head/devel/libdfui/Makefile head/dns/noip/Makefile head/editors/with-editor/Makefile head/math/prng/Makefile head/textproc/atom/Makefile head/textproc/c2html/Makefile head/www/tidy/Makefile Modified: head/benchmarks/httperf/Makefile ============================================================================== --- head/benchmarks/httperf/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/benchmarks/httperf/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -19,16 +19,17 @@ MAKE_ARGS= LIBUTIL_OBJS=ssl_writev.o \ PLIST_FILES= bin/httperf \ man/man1/httperf.1.gz +PORTDOCS= ChangeLog NEWS README TODO OPTIONS_DEFINE= DOCS -PORTDOCS= ChangeLog NEWS README TODO do-install: - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Modified: head/biology/velvet/Makefile ============================================================================== --- head/biology/velvet/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/biology/velvet/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -77,7 +77,9 @@ do-install: .for f in ${PERLMOD_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${f:H:T}/${f:T} .endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/comms/tio/Makefile ============================================================================== --- head/comms/tio/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/comms/tio/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -21,8 +21,8 @@ OPTIONS_SUB= yes BASH_CONFIGURE_WITH= bash-completion-dir -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/databases/pgbarman/Makefile ============================================================================== --- head/databases/pgbarman/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/databases/pgbarman/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -31,6 +31,8 @@ USE_PYTHON= autoplist distutils concurrent optsuffix PORTDOCS= tutorial.pdf +OPTIONS_DEFINE= DOCS + .include .if ${PGSQL_VER:M9\.[12345]} @@ -48,9 +50,12 @@ post-patch: ${SED} -i -e "s@%%PGUSER%%@${PGUSER}@" ${WRKSRC}/doc/barman.5 post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/barman.conf ${STAGEDIR}${ETCDIR}/barman.conf.sample + ${INSTALL_DATA} ${WRKSRC}/doc/barman.conf \ + ${STAGEDIR}${ETCDIR}/barman.conf.sample + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/databases/powerarchitect/Makefile ============================================================================== --- head/databases/powerarchitect/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/databases/powerarchitect/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -12,15 +12,8 @@ COMMENT= Data modeling and profiling tool LICENSE= GPLv3 -OPTIONS_DEFINE= MYSQL_JDBC PGSQL_JDBC - -MYSQL_JDBC_RUN_DEPENDS= ${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java -PGSQL_JDBC_RUN_DEPENDS= ${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc - USE_JAVA= yes - JAVA_VERSION= 1.6+ - NO_BUILD= yes PORTDOCS= * @@ -28,6 +21,11 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/architect-${PORTVERSION} SUB_FILES= ${PORTNAME} +OPTIONS_DEFINE= DOCS MYSQL_JDBC PGSQL_JDBC + +MYSQL_JDBC_RUN_DEPENDS= ${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java +PGSQL_JDBC_RUN_DEPENDS= ${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc + do-install: @${MKDIR} ${STAGEDIR}/${DATADIR}/jdbc (cd ${WRKSRC}/ && \ @@ -36,7 +34,8 @@ do-install: ${COPYTREE_SHARE} lib ${STAGEDIR}/${DATADIR}) ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README.generic ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.generic ${STAGEDIR}/${DOCSDIR} .include Modified: head/deskutils/showdown/Makefile ============================================================================== --- head/deskutils/showdown/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/deskutils/showdown/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -37,6 +37,6 @@ post-install: post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/api-sanity-autotest/Makefile ============================================================================== --- head/devel/api-sanity-autotest/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/api-sanity-autotest/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -28,7 +28,10 @@ USE_PERL5= run USE_GCC= 4.8 # same as devel/elfutils NO_BUILD= yes + PLIST_FILES= bin/${PORTNAME}.pl +PORTDOCS= Changes.html Descriptor.html Options.html Readme.html \ + SpecType.html OPTIONS_DEFINE= DOCS @@ -55,17 +58,13 @@ post-patch: do-install: @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin - .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING) check regression-test test: build cd ${WRKSRC}; ${PERL} ./${PORTNAME}.pl -test - .endif -PORTDOCS= Changes.html Descriptor.html Options.html Readme.html SpecType.html - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}/doc; ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/git-modes/Makefile ============================================================================== --- head/devel/git-modes/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/git-modes/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -33,8 +33,12 @@ GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:devel/git GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:devel/git do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc ${STAGEDIR}${PREFIX}/${ELISPDIR} - ${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ + ${STAGEDIR}${PREFIX}/${ELISPDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/gtkparasite/Makefile ============================================================================== --- head/devel/gtkparasite/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/gtkparasite/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -24,8 +24,8 @@ PLIST_FILES= lib/gtk-2.0/modules/libgtkparasite.so OPTIONS_DEFINE= DOCS -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/USAGE ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/USAGE ${STAGEDIR}/${DOCSDIR} .include Modified: head/devel/jsmin/Makefile ============================================================================== --- head/devel/jsmin/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/jsmin/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -16,14 +16,16 @@ GH_TAGNAME= 1bf6ce5 PLIST_FILES= bin/jsmin PORTDOCS= README -.include +OPTIONS_DEFINE= DOCS do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/libaura/Makefile ============================================================================== --- head/devel/libaura/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/libaura/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -9,9 +9,11 @@ MASTER_SITES= LOCAL/philip MAINTAINER= rodrigo@FreeBSD.org COMMENT= Library of Assorted Useful Reusable Abstractions -USES= tar:bzip2 +USES= tar:bzip2 USE_LDCONFIG= yes +MAKE_ENV= SONAME=${SONAME} SOLINK=${SOLINK} + SONAME= ${SOLINK}.3 SOLINK= ${PORTNAME}3.so @@ -24,18 +26,20 @@ PLIST_FILES= lib/${SONAME} \ include/aura3/mem.h PORTDOCS= README -MAKE_ENV= SONAME=${SONAME} SOLINK=${SOLINK} +OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${SONAME} ${STAGEDIR}${PREFIX}/lib/${SONAME} - ${LN} -s ${PREFIX}/lib/${SONAME} ${STAGEDIR}${PREFIX}/lib/${SOLINK} + ${INSTALL_PROGRAM} ${WRKSRC}/${SONAME} ${STAGEDIR}${PREFIX}/lib + ${LN} -s ${SONAME} ${STAGEDIR}${PREFIX}/lib/${SOLINK} ${MKDIR} ${STAGEDIR}${PREFIX}/include/aura3/ ${INSTALL_DATA} ${WRKSRC}/buffer.h ${STAGEDIR}${PREFIX}/include/aura3/ ${INSTALL_DATA} ${WRKSRC}/dict.h ${STAGEDIR}${PREFIX}/include/aura3/ ${INSTALL_DATA} ${WRKSRC}/popen.h ${STAGEDIR}${PREFIX}/include/aura3/ ${INSTALL_DATA} ${WRKSRC}/fspred.h ${STAGEDIR}${PREFIX}/include/aura3/ ${INSTALL_DATA} ${WRKSRC}/mem.h ${STAGEDIR}${PREFIX}/include/aura3/ + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/libdfui/Makefile ============================================================================== --- head/devel/libdfui/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/devel/libdfui/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -13,9 +13,11 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libaura3.so:devel/libaura -USES= tar:bzip2 +USES= tar:bzip2 USE_LDCONFIG= yes +MAKE_ENV= SONAME=${SONAME} SOLINK=${SOLINK} + SONAME= ${SOLINK}.4 SOLINK= ${PORTNAME}4.so @@ -31,13 +33,13 @@ PLIST_FILES= lib/${SONAME} \ include/dfui4/system.h PORTDOCS= README -MAKE_ENV= SONAME=${SONAME} SOLINK=${SOLINK} +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${SONAME} ${STAGEDIR}${PREFIX}/lib/${SONAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${SONAME} ${STAGEDIR}${PREFIX}/lib ${LN} -s ${SONAME} ${STAGEDIR}${PREFIX}/lib/${SOLINK} ${MKDIR} ${STAGEDIR}${PREFIX}/include/dfui4 ${INSTALL_DATA} ${WRKSRC}/conn_caps.h ${STAGEDIR}${PREFIX}/include/dfui4/ @@ -48,7 +50,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/encoding.h ${STAGEDIR}${PREFIX}/include/dfui4/ ${INSTALL_DATA} ${WRKSRC}/lang.h ${STAGEDIR}${PREFIX}/include/dfui4/ ${INSTALL_DATA} ${WRKSRC}/system.h ${STAGEDIR}${PREFIX}/include/dfui4/ + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/dns/noip/Makefile ============================================================================== --- head/dns/noip/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/dns/noip/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -27,9 +27,11 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/noip2 ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README.FIRST ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.FIRST ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} conf: (cd ${PREFIX}/etc && ${PREFIX}/bin/noip2 -C) Modified: head/editors/with-editor/Makefile ============================================================================== --- head/editors/with-editor/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/editors/with-editor/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -18,22 +18,25 @@ GH_ACCOUNT= magit USES= gmake makeinfo USE_EMACS= yes +MAKE_ENV= EFLAGS="-L ${PREFIX}/${EMACS_SITE_LISPDIR}" NO_ARCH= yes INFO= with-editor PORTDOCS= README.md -OPTIONS_DEFINE= DOCS - -MAKE_ENV+= EFLAGS="-L ${PREFIX}/${EMACS_SITE_LISPDIR}" - PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/with-editor.el \ ${EMACS_VERSION_SITE_LISPDIR}/with-editor.elc \ ${EMACS_VERSION_SITE_LISPDIR}/with-editor-autoloads.el +OPTIONS_DEFINE= DOCS + do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - ${INSTALL_MAN} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} - ${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ + ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Modified: head/math/prng/Makefile ============================================================================== --- head/math/prng/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/math/prng/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -20,21 +20,14 @@ PORTEXAMPLES= Makefile pairs.c tuples.c OPTIONS_DEFINE= DOCS EXAMPLES -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for _d in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/doc/${_d} ${STAGEDIR}${DOCSDIR} -.endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} + +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for _e in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/examples/${_e} ${STAGEDIR}${EXAMPLESDIR} -.endfor -.endif + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/examples/,} \ + ${STAGEDIR}${EXAMPLESDIR} check regression-test test: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ Modified: head/textproc/atom/Makefile ============================================================================== --- head/textproc/atom/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/textproc/atom/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -17,10 +17,14 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/atom man/man1/atom.1.gz PORTDOCS= README TODO testFile +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/c2html/Makefile ============================================================================== --- head/textproc/c2html/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/textproc/c2html/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -1,24 +1,25 @@ # Created by: Andrey Zakhvatov # $FreeBSD$ -PORTNAME= c2html -PORTVERSION= 0.9.6 -CATEGORIES= textproc www -MASTER_SITES= SUNSITE/apps/www/converters +PORTNAME= c2html +PORTVERSION= 0.9.6 +CATEGORIES= textproc www +MASTER_SITES= SUNSITE/apps/www/converters -MAINTAINER= mkamm@gmx.net +MAINTAINER= mkamm@gmx.net COMMENT= C-language sources to HTML converter LICENSE= GPLv2 GNU_CONFIGURE= yes + PLIST_FILES= bin/c2html man/man1/c2html.1.gz PORTDOCS= AUTHORS NEWS README -post-install: +OPTIONS_DEFINE= DOCS + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/tidy/Makefile ============================================================================== --- head/www/tidy/Makefile Thu Jan 11 17:57:44 2018 (r458760) +++ head/www/tidy/Makefile Thu Jan 11 18:09:00 2018 (r458761) @@ -25,10 +25,11 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tidy ${STAGEDIR}${PREFIX}/bin/tidy4 - ${INSTALL_MAN} ${WRKSRC}/man_page.txt ${STAGEDIR}${PREFIX}/man/man1/tidy4.1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for docfile in ${DOCFILES} - ${INSTALL_MAN} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}/ -.endfor + ${INSTALL_MAN} ${WRKSRC}/man_page.txt \ + ${STAGEDIR}${PREFIX}/man/man1/tidy4.1 + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include