4 files changed, 45 insertions, 47 deletions

diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index bece3bfaae71..d677ac71d11b 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	html2wml
-PORTVERSION=	0.4.6.p5
+PORTVERSION=	0.4.11
 CATEGORIES=	www
-MASTER_SITES=	http://maddingue.free.fr/techie/download/Html2Wml/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p5//}-pre5
+MASTER_SITES=	http://maddingue.free.fr/softwares/download/Html2Wml/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A CGI that can do on-the-fly HTML to WML conversion
@@ -34,7 +33,7 @@ checkconfig:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/html2wml/t/samples
-.for D in ARTISTIC COPYING INSTALL NEWS NOTES README TODO ChangeLog
+.for D in INSTALL NEWS NOTES README TODO ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/$D ${PREFIX}/share/doc/html2wml
 .endfor
 .for D in html pdf pod txt
diff --git a/www/html2wml/distinfo b/www/html2wml/distinfo
index 9d5be614bd66..80bf4b3d3d45 100644
--- a/www/html2wml/distinfo
+++ b/www/html2wml/distinfo
@@ -1 +1 @@
-MD5 (html2wml-0.4.6-pre5.tar.gz) = ebf253dc4061e247a1b670ef87cb1234
+MD5 (html2wml-0.4.11.tar.gz) = a65c1d6bb9c5e0a12113bcee33762f12
diff --git a/www/html2wml/files/patch-aa b/www/html2wml/files/patch-aa
index 04432d53e9e5..104a220b40e3 100644
--- a/www/html2wml/files/patch-aa
+++ b/www/html2wml/files/patch-aa
@@ -1,19 +1,20 @@
---- Makefile.orig	Mon May 14 01:07:59 2001
-+++ Makefile	Sat May 19 20:07:36 2001
+--- Makefile.orig	Sun Oct 26 16:23:22 2003
++++ Makefile	Thu Nov 20 01:44:55 2003
 @@ -1,7 +1,7 @@
  # =========================================================================== #
  # Configuration 
- 
 -PREFIX=/usr/local
+-CGIDIR=/home/httpd/cgi-bin
 +PREFIX?=/usr/local
- CGIDIR=/home/httpd/cgi-bin
++CGIDIR=${LOCALBASE}/www/cgi-bin
  
  # =========================================================================== #
-@@ -13,7 +13,7 @@
+ # Do not edit the following unless you know what are you are doing
+@@ -12,7 +12,7 @@
  # Standard subdirectories locations
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/man
--DOCDIR=$(PREFIX)/doc/html2wml-$(VERSION)
+-DOCDIR=$(PREFIX)/doc/html2wml
 +DOCDIR=$(PREFIX)/share/doc/html2wml
  
  MAN1DIR=$(MANDIR)/man1
@@ -23,9 +24,9 @@
  # Installaton targets
  install: check-config directories
 -	install -m 555 html2wml.cgi $(BINDIR)/html2wml
--	install -m 444 doc/html2wml.man $(MAN1DIR)/html2wml.1
--	install -m 444 ARTISTIC COPYING INSTALL NEWS NOTES README TODO ChangeLog $(DOCDIR)
--	make -C t/ install DOCDIR=$(DOCDIR)
+-	install -m 444 doc/html2wml.man $(MAN1DIR)/html2wml.1 
+-	install -m 444 COPYING INSTALL NEWS NOTES README TODO ChangeLog $(DOCDIR) 
+-	make -C t/ install DOCDIR=$(DOCDIR) 
 -	make -C doc/ install DOCDIR=$(DOCDIR)
 +	${BSD_INSTALL_SCRIPT} html2wml.cgi $(BINDIR)/html2wml
 +	${BSD_INSTALL_MAN} doc/html2wml.man $(MAN1DIR)/html2wml.1
diff --git a/www/html2wml/pkg-plist b/www/html2wml/pkg-plist
index 16aa06201916..50a02e9510c3 100644
--- a/www/html2wml/pkg-plist
+++ b/www/html2wml/pkg-plist
@@ -1,34 +1,32 @@
 bin/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/mix1.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/mix2.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/struct.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-a.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-anchor.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-br.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-double-tags.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-extcharset.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-frames.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-img.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-include.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-nest.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-no-tag.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-special-chars.html
-%%PORTDOCS%%share/doc/html2wml/t/samples/t-urls.html
-%%PORTDOCS%%@dirrm share/doc/html2wml/t/samples
-%%PORTDOCS%%@dirrm share/doc/html2wml/t
-%%PORTDOCS%%@dirrm share/doc/html2wml
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.pdf
+%%PORTDOCS%%%%DOCSDIR%%/readme.pod
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/t/form.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/inc_para.wml
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/inc_prev.wml
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/mix1.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/mix2.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/struct.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-a.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-anchor.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-br.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-double-tags.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-extcharset.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-frames.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-img.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-include.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-nest.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-no-tag.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-special-chars.html
+%%PORTDOCS%%%%DOCSDIR%%/t/samples/t-urls.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/t/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/t
+%%PORTDOCS%%@dirrm %%DOCSDIR%%