4 files changed, 48 insertions, 31 deletions

diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 5b0b706d9e6b..cd4c2ab69e02 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	html2wml
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://maddingue.free.fr/techie/download/Html2Wml/
 
-MAINTAINER=	greid@ukug.uk.freebsd.org
+MAINTAINER=	greid@FreeBSD.org
 
 RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
@@ -30,4 +30,22 @@ do-build:
 checkconfig:
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} default
 
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/html2wml/t/samples
+.for D in ARTISTIC COPYING INSTALL NEWS NOTES README TODO ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/$D ${PREFIX}/share/doc/html2wml
+.endfor
+.for D in html pdf pod txt
+	${INSTALL_DATA} ${WRKSRC}/doc/readme.$D ${PREFIX}/share/doc/html2wml
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/t/form.html \
+		${PREFIX}/share/doc/html2wml/t
+.for D in inc_para.wml inc_prev.wml include.html links.html mix1.html \
+	mix2.html struct.html xtreme.html
+	${INSTALL_DATA} ${WRKSRC}/t/samples/$D \
+		${PREFIX}/share/doc/html2wml/t/samples
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/html2wml/distinfo b/www/html2wml/distinfo
index b01b0f89f4d7..d77459590d1b 100644
--- a/www/html2wml/distinfo
+++ b/www/html2wml/distinfo
@@ -1 +1 @@
-MD5 (html2wml-0.4.0.tar.gz) = 658d990cbb9aff1d1c3b7356ef920ff0
+MD5 (html2wml-0.4.2.tar.gz) = 36b1bf88365cbbdb67cffa3ae7c35196
diff --git a/www/html2wml/files/patch-aa b/www/html2wml/files/patch-aa
index 1e148c31329e..04432d53e9e5 100644
--- a/www/html2wml/files/patch-aa
+++ b/www/html2wml/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Mar  9 09:28:18 2001
-+++ Makefile	Wed Mar 21 06:53:35 2001
+--- Makefile.orig	Mon May 14 01:07:59 2001
++++ Makefile	Sat May 19 20:07:36 2001
 @@ -1,7 +1,7 @@
  # =========================================================================== #
  # Configuration 
@@ -18,7 +18,7 @@
  
  MAN1DIR=$(MANDIR)/man1
  
-@@ -31,14 +31,14 @@
+@@ -31,14 +31,11 @@
  
  # Installaton targets
  install: check-config directories
@@ -29,9 +29,6 @@
 -	make -C doc/ install DOCDIR=$(DOCDIR)
 +	${BSD_INSTALL_SCRIPT} html2wml.cgi $(BINDIR)/html2wml
 +	${BSD_INSTALL_MAN} doc/html2wml.man $(MAN1DIR)/html2wml.1
-+	${BSD_INSTALL_DATA} ARTISTIC COPYING INSTALL NEWS NOTES README TODO ChangeLog $(DOCDIR)
-+	cd t; ${MAKE} install DOCDIR=$(DOCDIR)
-+	cd doc; ${MAKE} install DOCDIR=$(DOCDIR)
  
  installcgi: check-config
 -	install -m 555 html2wml.cgi $(CGIDIR)
diff --git a/www/html2wml/pkg-plist b/www/html2wml/pkg-plist
index b936f4e85b9b..6c10b5691130 100644
--- a/www/html2wml/pkg-plist
+++ b/www/html2wml/pkg-plist
@@ -1,23 +1,25 @@
 bin/html2wml
-share/doc/html2wml/ARTISTIC
-share/doc/html2wml/ChangeLog
-share/doc/html2wml/COPYING
-share/doc/html2wml/INSTALL
-share/doc/html2wml/NEWS
-share/doc/html2wml/NOTES
-share/doc/html2wml/README
-share/doc/html2wml/TODO
-share/doc/html2wml/readme.html
-share/doc/html2wml/readme.pdf
-share/doc/html2wml/readme.pod
-share/doc/html2wml/t/form.html
-share/doc/html2wml/t/samples/inc_para.wml
-share/doc/html2wml/t/samples/inc_prev.wml
-share/doc/html2wml/t/samples/include.html
-share/doc/html2wml/t/samples/links.html
-share/doc/html2wml/t/samples/mix1.html
-share/doc/html2wml/t/samples/mix2.html
-share/doc/html2wml/t/samples/struct.html
-@dirrm share/doc/html2wml/t/samples
-@dirrm share/doc/html2wml/t
-@dirrm share/doc/html2wml
+%%PORTDOCS%%share/doc/html2wml/ARTISTIC
+%%PORTDOCS%%share/doc/html2wml/COPYING
+%%PORTDOCS%%share/doc/html2wml/ChangeLog
+%%PORTDOCS%%share/doc/html2wml/INSTALL
+%%PORTDOCS%%share/doc/html2wml/NEWS
+%%PORTDOCS%%share/doc/html2wml/NOTES
+%%PORTDOCS%%share/doc/html2wml/README
+%%PORTDOCS%%share/doc/html2wml/TODO
+%%PORTDOCS%%share/doc/html2wml/readme.html
+%%PORTDOCS%%share/doc/html2wml/readme.pdf
+%%PORTDOCS%%share/doc/html2wml/readme.pod
+%%PORTDOCS%%share/doc/html2wml/readme.txt
+%%PORTDOCS%%share/doc/html2wml/t/form.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/inc_para.wml
+%%PORTDOCS%%share/doc/html2wml/t/samples/inc_prev.wml
+%%PORTDOCS%%share/doc/html2wml/t/samples/include.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/links.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/mix1.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/mix2.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/struct.html
+%%PORTDOCS%%share/doc/html2wml/t/samples/xtreme.html
+%%PORTDOCS%%@dirrm share/doc/html2wml/t/samples
+%%PORTDOCS%%@dirrm share/doc/html2wml/t
+%%PORTDOCS%%@dirrm share/doc/html2wml