Index: head/www/html2wml/Makefile
===================================================================
--- head/www/html2wml/Makefile	(revision 367139)
+++ head/www/html2wml/Makefile	(revision 367140)
@@ -1,55 +1,62 @@
 # Created by: George Reid <greid@ukug.uk.freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	html2wml
 PORTVERSION=	0.4.11
 CATEGORIES=	www
-MASTER_SITES=	SF/htmlwml/Html2Wml/${PORTVERSION} http://maddingue.free.fr/softwares/download/Html2Wml/
+MASTER_SITES=	SF/htmlwml/Html2Wml/${PORTVERSION} \
+		http://maddingue.free.fr/softwares/download/Html2Wml/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CGI that can do on-the-fly HTML to WML conversion
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LICENSE=	GPLv2
 
-USES=		perl5
-MAKE_ARGS=	PREFIX=${PREFIX} DOCDIR=${DOCDIR}
+RUN_DEPENDS=	p5-Text-Template>0:${PORTSDIR}/textproc/p5-Text-Template \
+		p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww
 
-PLIST_FILES=	bin/html2wml
-MAN1=		html2wml.1
-.if !defined(NOPORTDOCS)
+USES=		perl5 shebangfix
+SHEBANG_FILES=	html2wml.cgi
+
 PORTDOCS=	*
-.endif
+PLIST_FILES=	bin/html2wml man/man1/html2wml.1.gz
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	cd ${BUILD_WRKSRC}/doc; \
 	${LN} -sf readme.pod html2wml.pod; \
 	pod2man --center="Html2Wml Documentation" \
 		--release=0.4.0 html2wml.pod > html2wml.man
 
 checkconfig:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} default
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} default
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/html2wml/t/samples
+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)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for D in INSTALL NEWS NOTES README TODO ChangeLog
-	${INSTALL_DATA} ${WRKSRC}/$D ${PREFIX}/share/doc/html2wml
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${D} \
+		${STAGEDIR}${DOCSDIR})
 .endfor
 .for D in html pdf pod txt
-	${INSTALL_DATA} ${WRKSRC}/doc/readme.$D ${PREFIX}/share/doc/html2wml
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} readme.${D} \
+		${STAGEDIR}${DOCSDIR})
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/t/form.html \
-		${PREFIX}/share/doc/html2wml/t
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/t
+	(cd ${WRKSRC}/t && ${INSTALL_DATA} 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
-	${INSTALL_DATA} ${WRKSRC}/t/samples/$D \
-		${PREFIX}/share/doc/html2wml/t/samples
+	(cd ${WRKSRC}/t/samples && ${INSTALL_DATA} ${D} \
+		${STAGEDIR}${DOCSDIR}/t/samples)
 .endfor
-.endif
 
 .include <bsd.port.mk>