- Add LICENSE_FILE

- Add NO_ARCH
- Switch to options helpers
- Simplify installation

1 files changed, 13 insertions, 15 deletions

diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 03c33c9080ea..9337578fbb73 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -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:${PORTSDIR}/textproc/p5-Text-Template \
 
 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 <bsd.port.mk>