From owner-svn-ports-all@freebsd.org Sat Aug 6 09:01:03 2016 Return-Path: Delivered-To: svn-ports-all@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 69FA9BB03A0; Sat, 6 Aug 2016 09:01:03 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 2196F14E3; Sat, 6 Aug 2016 09:01:03 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u76912Ar013244; Sat, 6 Aug 2016 09:01:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u76912CP013242; Sat, 6 Aug 2016 09:01:02 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608060901.u76912CP013242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 6 Aug 2016 09:01:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419736 - head/www/htmlpp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 09:01:03 -0000 Author: amdmi3 Date: Sat Aug 6 09:01:02 2016 New Revision: 419736 URL: https://svnweb.freebsd.org/changeset/ports/419736 Log: - Switch to options helpers - Simplify installation Modified: head/www/htmlpp/Makefile head/www/htmlpp/pkg-plist Modified: head/www/htmlpp/Makefile ============================================================================== --- head/www/htmlpp/Makefile Sat Aug 6 08:51:43 2016 (r419735) +++ head/www/htmlpp/Makefile Sat Aug 6 09:01:02 2016 (r419736) @@ -15,20 +15,24 @@ LICENSE= GPLv2+ USES= perl5 shebangfix tar:tgz SHEBANG_FILES= htmlpp - NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes +PORTDOCS= * + +OPTIONS_DEFINE= DOCS + do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} - ${INSTALL_SCRIPT} ${WRKSRC}/htmlpp ${STAGEDIR}${PREFIX}/bin/htmlpp - ${INSTALL_DATA} ${WRKSRC}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/htmlpp.d - (cd ${WRKSRC}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/$${FILE}; done) - (cd ${WRKSRC}; for FILE in *.def; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/bin/$${FILE}; done) + @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} + ${INSTALL_SCRIPT} ${WRKSRC}/htmlpp ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/*.def ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ + ${INSTALL_DATA} ${WRKSRC}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ ${INSTALL_DATA} ${WRKSRC}/guru_opt.fmt ${STAGEDIR}${PREFIX}/bin/guru.fmt - (cd ${WRKSRC}; ${MKDIR} ${STAGEDIR}${DOCSDIR}; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) - (cd ${WRKSRC}; for FILE in *.gif; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) - (cd ${WRKSRC}; for FILE in *.txt; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} *.htm *.gif *.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/www/htmlpp/pkg-plist ============================================================================== --- head/www/htmlpp/pkg-plist Sat Aug 6 08:51:43 2016 (r419735) +++ head/www/htmlpp/pkg-plist Sat Aug 6 09:01:02 2016 (r419736) @@ -11,14 +11,3 @@ bin/guru.fmt %%SITE_PERL%%/sfldate.pl %%SITE_PERL%%/shellwd.pl %%SITE_PERL%%/textdb.pl -share/doc/htmlpp/index.htm -share/doc/htmlpp/index1.htm -share/doc/htmlpp/index2.htm -share/doc/htmlpp/index3.htm -share/doc/htmlpp/index4.htm -share/doc/htmlpp/index5.htm -share/doc/htmlpp/htmlpp1.gif -share/doc/htmlpp/im0096c.gif -share/doc/htmlpp/newstone.gif -share/doc/htmlpp/gurutst.txt -share/doc/htmlpp/htmlpp.txt