7 files changed, 84 insertions, 111 deletions

diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index 672210592b88..e7157f8cebc8 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	wyvern
-PORTVERSION=	1.0.4
+PORTVERSION=	2.0.4
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://www.MysticWALL.com/software/src/
+MASTER_SITES=	http://www.MysticWALL.COM/software/src/
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/www/wyvern/distinfo b/www/wyvern/distinfo
index dc1826602ede..9ec985074b86 100644
--- a/www/wyvern/distinfo
+++ b/www/wyvern/distinfo
@@ -1 +1 @@
-MD5 (wyvern-1.0.4.tar.bz2) = ce3bc91e49153345a095d17b311f6bc2
+MD5 (wyvern-2.0.4.tar.bz2) = 97c6e85da5248dca9e8d39cf745df757
diff --git a/www/wyvern/files/patch-Makefile.in b/www/wyvern/files/patch-Makefile.in
index 67f50830273b..af8864ad304a 100644
--- a/www/wyvern/files/patch-Makefile.in
+++ b/www/wyvern/files/patch-Makefile.in
@@ -1,38 +1,11 @@
---- Makefile.in.orig	Sun Mar  4 22:41:15 2001
-+++ Makefile.in	Mon Aug  6 18:00:15 2001
-@@ -48,7 +48,7 @@
- install_admin_md5 = dot.admin_passwd_md5
- install_conf	  = wyvern.conf wyvern.conf.ja mime.types @ssl_cnf@
- install_docs	  = AUTHORS ChangeLog LICENSE NEWS README TODO README.module README.en README.module.en LICENSE.en
--install_htdocs	  = index.html
-+install_htdocs	  = index.html-dist
- install_admin	  = menu.whtml config.whtml passwd.whtml module.whtml roaming.whtml
- install_samples	  = dot.waccess dot.wpasswd hosts.allow hosts.deny
- install_rc_d	  = wyvern.sh
-@@ -74,21 +74,20 @@
- 	${INSTALL} -m 444 ${install_docs} ${docsdir}
- 	-(cd ${confdir}; ${MV} wyvern.conf wyvern.conf.old)
- 	-(cd ${confdir}; ${MV} mime.types mime.types.old)
--	(cd conf; ${INSTALL_DATA} ${install_conf} ${confdir})
-+	(cd conf; for f in ${install_conf}; do ${INSTALL_DATA} $${f} ${confdir}/$${f}-dist; done)
-+	(cd ${confdir}; for f in ${install_conf}; do [ -f $${f} ] || cp $${f}-dist $${f}; done)
- 	(cd style; ${INSTALL_DATA} *.css ${styledir})
- 	(cd icons; ${INSTALL} -m 444 *.gif ${iconsdir})
- 	(cd images; ${INSTALL} -m 444 *.jpg ${imagesdir})
- 	(cd htdocs; ${INSTALL_DATA} ${install_htdocs} ${htdocsdir})
- 	(cd admin; ${INSTALL_DATA} ${install_admin} ${admindir})
- 	(cd manual; ${MAKE} install)
--	(cd etc; ${INSTALL_DATA} ${install_admin_pwd} ${etcdir}/.admin_passwd)
--	(cd etc; ${INSTALL_DATA} ${install_admin_md5} ${etcdir}/.admin_passwd_md5)
--	(cd ${etcdir}; ${bindir}/plain2dbm .admin_passwd)
--	(cd ${etcdir}; ${bindir}/plain2dbm .admin_passwd_md5)
-+	(cd etc; for f in ${install_admin_pwd} ${install_admin_md5}; do ${INSTALL_DATA} $${f} ${etcdir}/$${f#dot}-dist; done)
-+	(cd ${etcdir}; for f in ${install_admin_pwd} ${install_admin_md5}; do ${bindir}/plain2dbm $${f#dot}-dist; [ -f $${f#dot} ] || cp $${f#dot}-dist $${f#dot}; done)
- 	(cd etc/rc.d; ${INSTALL} -m 555 ${install_rc_d} ${rcdir})
- 	(cd samples; ${INSTALL_DATA} ${install_samples} ${samplesdir})
- 	(cd cgi-bin; ${MAKE} install)
+--- conf/Makefile.in.org	Sun Feb  3 02:30:09 2002
++++ conf/Makefile.in	Sun Feb  3 02:42:02 2002
+@@ -39,7 +39,7 @@
+ 	for file in ${install_conf}; do \
+ 		[ -f $${file} ] || ${CP} $${file}.sample $${file}; \
+ 	done)
 -	@if [ "x${SSL_CMD}" != "x" ]; then ${MAKE} certificate; fi
 +#	@if [ "x${SSL_CMD}" != "x" ]; then ${MAKE} certificate; fi
  
- update::	check-dirs
- 	(cd src; ${MAKE} install)
+ 
+ ###############################################################################
diff --git a/www/wyvern/files/patch-configure.in b/www/wyvern/files/patch-configure.in
index a288fee38fd6..6703e3747712 100644
--- a/www/wyvern/files/patch-configure.in
+++ b/www/wyvern/files/patch-configure.in
@@ -1,11 +1,11 @@
---- configure.in.orig	Mon Mar  5 18:37:33 2001
-+++ configure.in	Tue Apr 17 15:11:11 2001
-@@ -102,7 +102,7 @@
-     CFLAGS="-g -DDEBUG"
-   fi
- else
--  CFLAGS="-O2"
-+#  CFLAGS="-O2"
- fi
+--- htdocs/Makefile.in.org	Tue Oct  9 04:12:36 2001
++++ htdocs/Makefile.in	Sun Feb  3 00:16:00 2002
+@@ -14,7 +14,7 @@
+ INSTALL         = @INSTALL@
+ INSTALL_DATA    = @INSTALL_DATA@
  
- if test "x$mail_announce" = "xyes" ; then
+-install_htdocs	  = index.html
++install_htdocs	  = index.html-dist
+ 
+ 
+ ###############################################################################
diff --git a/www/wyvern/pkg-comment b/www/wyvern/pkg-comment
index 724b50b2c284..f82703811a82 100644
--- a/www/wyvern/pkg-comment
+++ b/www/wyvern/pkg-comment
@@ -1 +1 @@
-HTTP server with the simple design, easy setup and small size
+Simple/powerful/lightweight/secure/embed-able HTTP server
diff --git a/www/wyvern/pkg-descr b/www/wyvern/pkg-descr
index 51a74e32f1d5..625437bb28d5 100644
--- a/www/wyvern/pkg-descr
+++ b/www/wyvern/pkg-descr
@@ -1,7 +1,18 @@
-Wivern is a lightweight HTTP server with the simple design, easy setup
-and small size.
+Wyvern is a lightweight HTTP server of simple design, easy setup /
+administration, and a small server run-time.  The goal of the Wyvern
+development is to provide a secure and stable web server for embedded
+appliances.  Here is a feature list of Wyvern:
 
-There is a web site in Japanese:
-http://www.MysticWALL.com/software/wyvern/wyvern.html
+  o  single-process server using select(2) and non-blocking I/O,
+  o  HTTP/1.1 support (not fully implemented),
+  o  host name based virtual hosting,
+  o  customizable error pages,
+  o  IPv6 communication (experimental),
+  o  Secure Socket Layer (SSL) communication,
+  o  highly secure implementation,
+  o  MD5 encrypted password management with dbm,
+  o  ErrorLog logging with syslogd(8), and
+  o  extensible plug-in modules.
 
 Author:	Kouichi ABE (WALL) <kouichi@MysticWALL.COM>
+WWW:	http://www.MysticWALL.COM/software/wyvern/wyvern.html
diff --git a/www/wyvern/pkg-plist b/www/wyvern/pkg-plist
index 70bedcf6e45c..8229befa23ed 100644
--- a/www/wyvern/pkg-plist
+++ b/www/wyvern/pkg-plist
@@ -2,48 +2,36 @@
 etc/rc.d/wyvern.sh
 sbin/wyvern
 sbin/wyvernctl
-wyvern/admin/menu.whtml
-wyvern/admin/config.whtml
-wyvern/admin/passwd.whtml
-wyvern/admin/module.whtml
-wyvern/admin/roaming.whtml
-wyvern/bin/plain2dbm
 wyvern/bin/wpasswd
 wyvern/cgi-bin/README.html
 wyvern/cgi-bin/dic-tools.cgi
 wyvern/cgi-bin/file-upload.cgi
+wyvern/cgi-bin/gateway.rb
 wyvern/cgi-bin/location.cgi
 wyvern/cgi-bin/printenv.cgi
-wyvern/cgi-bin/gateway.rb
 wyvern/cgi-bin/printenv.rb
-@unexec if cmp -s %D/wyvern/conf/mime.types %D/wyvern/conf/mime.types-dist; then rm -f %D/wyvern/conf/mime.types; fi
-wyvern/conf/mime.types-dist
+@unexec if cmp -s %D/wyvern/conf/mime.types %D/wyvern/conf/mime.types.sample; then rm -f %D/wyvern/conf/mime.types; fi
+wyvern/conf/mime.types.sample
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/wyvern/conf/wyvern.conf %D/wyvern/conf/wyvern.conf-dist; then rm -f %D/wyvern/conf/wyvern.conf; fi
-wyvern/conf/wyvern.conf-dist
+@unexec if cmp -s %D/wyvern/conf/wyvern.conf %D/wyvern/conf/wyvern.conf.sample; then rm -f %D/wyvern/conf/wyvern.conf; fi
+wyvern/conf/wyvern.conf.sample
 @exec [ ! -f %B/wyvern.conf ] && cp %B/%f %B/wyvern.conf
-@unexec if cmp -s %D/wyvern/conf/wyvern.conf.ja %D/wyvern/conf/wyvern.conf.ja-dist; then rm -f %D/wyvern/conf/wyvern.conf.ja; fi
-wyvern/conf/wyvern.conf.ja-dist
+@unexec if cmp -s %D/wyvern/conf/wyvern.conf.ja %D/wyvern/conf/wyvern.conf.ja.sample; then rm -f %D/wyvern/conf/wyvern.conf.ja; fi
+wyvern/conf/wyvern.conf.ja.sample
 @exec [ ! -f %B/wyvern.conf.ja ] && cp %B/%f %B/wyvern.conf.ja
-@unexec if cmp -s %D/wyvern/conf/ssl.cnf %D/wyvern/conf/ssl.cnf-dist; then rm -f %D/wyvern/conf/ssl.cnf; fi
-wyvern/conf/ssl.cnf-dist
+@unexec if cmp -s %D/wyvern/conf/ssl.cnf %D/wyvern/conf/ssl.cnf.sample; then rm -f %D/wyvern/conf/ssl.cnf; fi
+wyvern/conf/ssl.cnf.sample
 @exec [ ! -f %B/ssl.cnf ] && cp %B/%f %B/ssl.cnf
 wyvern/docs/AUTHORS
-wyvern/docs/ChangeLog
 wyvern/docs/LICENSE
-wyvern/docs/LICENSE.en
+wyvern/docs/LICENSE.ja
 wyvern/docs/NEWS
 wyvern/docs/README
-wyvern/docs/README.en
+wyvern/docs/README.ja
 wyvern/docs/README.module
-wyvern/docs/README.module.en
-wyvern/docs/TODO
-@unexec if cmp -s %D/wyvern/etc/.admin_passwd %D/wyvern/etc/.admin_passwd-dist; then rm -f %D/wyvern/etc/.admin_passwd; fi
-wyvern/etc/.admin_passwd-dist
-@exec [ ! -f %B/.admin_passwd ] && cp %B/%f %B/.admin_passwd
-@unexec if cmp -s %D/wyvern/etc/.admin_passwd_md5 %D/wyvern/etc/.admin_passwd_md5-dist; then rm -f %D/wyvern/etc/.admin_passwd_md5; fi
-wyvern/etc/.admin_passwd_md5-dist
-@exec [ ! -f %B/.admin_passwd_md5 ] && cp %B/%f %B/.admin_passwd_md5
+wyvern/docs/README.module.ja
+wyvern/docs/SECURITY
+wyvern/docs/UPDATING
 @unexec if cmp -s %D/wyvern/htdocs/index.html %D/wyvern/htdocs/index.html-dist; then rm -f %D/wyvern/htdocs/index.html; fi
 wyvern/htdocs/index.html-dist
 @exec [ ! -f %B/index.html ] && cp %B/%f %B/index.html
@@ -99,56 +87,55 @@ wyvern/icons/text.gif
 wyvern/icons/transfer.gif
 wyvern/icons/unknown.gif
 wyvern/icons/uuencoded.gif
-wyvern/images/wyvern-logo.jpg
-wyvern/images/wyvern-logo2.jpg
-wyvern/images/wyvern-logo3.jpg
-wyvern/manual/Wyvern-Logo.jpg
-wyvern/manual/flame02.jpg
-wyvern/manual/wyvern.css
-wyvern/manual/wyvern.html
+wyvern/images/mwx-wyvern-banner.png
+wyvern/images/wyvern-banner.png
+wyvern/manual/access.html
+wyvern/manual/acknowledgement.html
+wyvern/manual/appendix-A.html
+wyvern/manual/authentication.html
+wyvern/manual/bibliography.html
+wyvern/manual/cgi.html
+wyvern/manual/commercial.html
+wyvern/manual/conclusion.html
 wyvern/manual/contents.html
-wyvern/manual/introduction.html
+wyvern/manual/copyright.html
+wyvern/manual/dbm.html
+wyvern/manual/faq.html
 wyvern/manual/features.html
+wyvern/manual/howto.html
+wyvern/manual/index.html
 wyvern/manual/install.html
+wyvern/manual/introduction.html
+wyvern/manual/license.html
+wyvern/manual/logformat.html
+wyvern/manual/mwx-wyvern-banner.png
 wyvern/manual/setup.html
-wyvern/manual/howto.html
-wyvern/manual/cgi.html
 wyvern/manual/ssi.html
-wyvern/manual/authentication.html
-wyvern/manual/access.html
-wyvern/manual/admin-tools.html
 wyvern/manual/ssl.html
-wyvern/manual/roaming.html
-wyvern/manual/logformat.html
-wyvern/manual/copyright.html
-wyvern/manual/license.html
-wyvern/manual/conclusion.html
-wyvern/manual/bibliography.html
-wyvern/manual/acknowledgement.html
-wyvern/manual/faq.html
-wyvern/manual/index.html
-wyvern/modules/log.mod
-wyvern/modules/cgi.mod
-wyvern/modules/ssi.mod
-wyvern/modules/auth.mod
+wyvern/manual/syslog.html
+wyvern/manual/wyvern-manual.png
+wyvern/manual/wyvern.css
+wyvern/manual/wyvern.html
 wyvern/modules/access.mod
+wyvern/modules/auth.mod
+wyvern/modules/cgi.mod
 wyvern/modules/dir.mod
+wyvern/modules/gzip.mod
 wyvern/modules/ident.mod
-wyvern/modules/roaming.mod
-wyvern/modules/admin.mod
-wyvern/modules/newlog.mod
+wyvern/modules/log.mod
 wyvern/modules/moredir.mod
 wyvern/modules/newdir.mod
+wyvern/modules/newlog.mod
+wyvern/modules/ssi.mod
 wyvern/samples/dot.waccess
 wyvern/samples/dot.wpasswd
 wyvern/samples/hosts.allow
-wyvern/samples/hosts.deny
+wyvern/samples/missing.html
 wyvern/style/default.css
-wyvern/style/wyvern.css
 wyvern/sbin/wyvern
 wyvern/sbin/wyvernctl
-@comment @dirrm wyvern/admin
 @comment @dirrm wyvern/bin
+@comment @dirrm wyvern/cache
 @comment @dirrm wyvern/cgi-bin
 @comment @dirrm wyvern/conf
 @comment @dirrm wyvern/docs
@@ -156,6 +143,8 @@ wyvern/sbin/wyvernctl
 @comment @dirrm wyvern/htdocs
 @comment @dirrm wyvern/icons
 @comment @dirrm wyvern/images
+@comment @dirrm wyvern/libexec
+@comment @dirrm wyvern/logs
 @comment @dirrm wyvern/manual
 @comment @dirrm wyvern/modules
 @comment @dirrm wyvern/samples