Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Aug 2016 09:01:02 +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: r419736 - head/www/htmlpp
Message-ID:  <201608060901.u76912CP013242@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



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