From owner-svn-ports-head@freebsd.org Thu Feb 18 09:48:18 2016 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 3EF49AAC285; Thu, 18 Feb 2016 09:48:18 +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 E759110ED; Thu, 18 Feb 2016 09:48:17 +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 u1I9mGJx000918; Thu, 18 Feb 2016 09:48:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1I9mGhD000917; Thu, 18 Feb 2016 09:48:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602180948.u1I9mGhD000917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 18 Feb 2016 09:48:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409101 - head/www/html2wml X-SVN-Group: ports-head 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.20 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, 18 Feb 2016 09:48:18 -0000 Author: amdmi3 Date: Thu Feb 18 09:48:16 2016 New Revision: 409101 URL: https://svnweb.freebsd.org/changeset/ports/409101 Log: - Add LICENSE_FILE - Add NO_ARCH - Switch to options helpers - Simplify installation Modified: head/www/html2wml/Makefile Modified: head/www/html2wml/Makefile ============================================================================== --- head/www/html2wml/Makefile Thu Feb 18 09:48:06 2016 (r409100) +++ head/www/html2wml/Makefile Thu Feb 18 09:48:16 2016 (r409101) @@ -11,6 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CGI that can do on-the-fly HTML to WML conversion LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-Text-Template>0:${PORTSDIR}/textproc/p5-Text-Template \ p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \ @@ -18,6 +19,7 @@ RUN_DEPENDS= p5-Text-Template>0:${PORTSD USES= perl5 shebangfix SHEBANG_FILES= html2wml.cgi +NO_ARCH= yes PORTDOCS= * PLIST_FILES= bin/html2wml man/man1/html2wml.1.gz @@ -34,29 +36,25 @@ checkconfig: @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} default do-install: - (cd ${WRKSRC} && ${INSTALL_SCRIPT} html2wml.cgi \ - ${STAGEDIR}${PREFIX}/bin/html2wml) - (cd ${WRKSRC}/doc && ${INSTALL_DATA} html2wml.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/html2wml.1) + ${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi \ + ${STAGEDIR}${PREFIX}/bin/html2wml + ${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man \ + ${STAGEDIR}${MANPREFIX}/man/man1/html2wml.1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for D in INSTALL NEWS NOTES README TODO ChangeLog - (cd ${WRKSRC} && ${INSTALL_DATA} ${D} \ - ${STAGEDIR}${DOCSDIR}) -.endfor -.for D in html pdf pod txt - (cd ${WRKSRC}/doc && ${INSTALL_DATA} readme.${D} \ - ${STAGEDIR}${DOCSDIR}) +.for f in INSTALL NEWS NOTES README TODO ChangeLog \ + doc/readme.html doc/readme.pdf doc/readme.pod doc/readme.txt + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR}/t - (cd ${WRKSRC}/t && ${INSTALL_DATA} form.html \ - ${STAGEDIR}${DOCSDIR}/t) + ${INSTALL_DATA} ${WRKSRC}/t/form.html ${STAGEDIR}${DOCSDIR}/t @${MKDIR} ${STAGEDIR}${DOCSDIR}/t/samples .for D in inc_para.wml inc_prev.wml mix1.html mix2.html struct.html \ t-a.html t-anchor.html t-br.html t-double-tags.html t-extcharset.html \ t-frames.html t-img.html t-include.html t-nest.html t-no-tag.html \ t-special-chars.html t-urls.html - (cd ${WRKSRC}/t/samples && ${INSTALL_DATA} ${D} \ - ${STAGEDIR}${DOCSDIR}/t/samples) + ${INSTALL_DATA} ${WRKSRC}/t/samples/${D} ${STAGEDIR}${DOCSDIR}/t/samples .endfor .include