- Update to 2.1.2

PR:		ports/75981
Submitted by:	Kouichi ABE (WALL) <kouichi@mysticwall.com> (maintainer)

4 files changed, 47 insertions, 34 deletions

diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index aca997f48fd8..6bf9ccc82074 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	wyvern
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTVERSION=	2.1.2
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://www.MysticWALL.COM/software/src/
+MASTER_SITES=	http://www.MysticWALL.COM/download/
 
 MAINTAINER=	kouichi@MysticWALL.COM
 COMMENT=	Simple/powerful/lightweight/secure/embed-able HTTP server
 
-USE_BZIP2=	yes
-USE_OPENSSL=	yes
-USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_BZIP2=		yes
+USE_OPENSSL=		yes
+USE_GMAKE=		yes
+USE_AUTOCONF_VER=	259
+
+NO_MTREE=		yes
+
 PREFIX=		${LOCALBASE}/wyvern
 CONFIGURE_ARGS=	--with-ssl=yes \
 		--with-ssl-includes="${OPENSSLINC}" \
@@ -30,15 +32,11 @@ MAKE_ARGS=	rcdir="${LOCALBASE}/etc/rc.d"
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 post-extract:
 	${MV} ${WRKSRC}/htdocs/index.html ${WRKSRC}/htdocs/index.html-dist
 
 post-install:
-	${LN} -sf ${PREFIX}/sbin/* ${LOCALBASE}/sbin/
+	${LN} -sf ${PREFIX}/sbin/wyvern ${LOCALBASE}/sbin/
 	if [ ! -f ${PREFIX}/htdocs/index.html ]; then \
 		${CP} -p ${PREFIX}/htdocs/index.html-dist ${PREFIX}/htdocs/index.html; \
 	fi
diff --git a/www/wyvern/distinfo b/www/wyvern/distinfo
index a4c5815cdcef..ce133b0ac1e8 100644
--- a/www/wyvern/distinfo
+++ b/www/wyvern/distinfo
@@ -1,2 +1,2 @@
-MD5 (wyvern-2.0.6.tar.bz2) = f3d8f90e75ccc42e94a8b6f8693a2f07
-SIZE (wyvern-2.0.6.tar.bz2) = 370115
+MD5 (wyvern-2.1.2.tar.bz2) = c859a86344269a1ac0bf6f0da35fe632
+SIZE (wyvern-2.1.2.tar.bz2) = 425115
diff --git a/www/wyvern/pkg-descr b/www/wyvern/pkg-descr
index 625437bb28d5..a5276fef9443 100644
--- a/www/wyvern/pkg-descr
+++ b/www/wyvern/pkg-descr
@@ -15,4 +15,4 @@ appliances.  Here is a feature list of Wyvern:
   o  extensible plug-in modules.
 
 Author:	Kouichi ABE (WALL) <kouichi@MysticWALL.COM>
-WWW:	http://www.MysticWALL.COM/software/wyvern/wyvern.html
+WWW:	http://www.MysticWALL.COM/software/wyvern/index.html
diff --git a/www/wyvern/pkg-plist b/www/wyvern/pkg-plist
index 8229befa23ed..372e4a5b3b0b 100644
--- a/www/wyvern/pkg-plist
+++ b/www/wyvern/pkg-plist
@@ -1,8 +1,14 @@
 @cwd %%LOCALBASE%%
 etc/rc.d/wyvern.sh
 sbin/wyvern
-sbin/wyvernctl
 wyvern/bin/wpasswd
+wyvern/include/functions.h
+wyvern/include/mesg.h
+wyvern/include/module.h
+wyvern/include/status.h
+wyvern/include/version.h
+wyvern/include/wpath.h
+wyvern/include/wyvern.h
 wyvern/cgi-bin/README.html
 wyvern/cgi-bin/dic-tools.cgi
 wyvern/cgi-bin/file-upload.cgi
@@ -89,12 +95,11 @@ wyvern/icons/unknown.gif
 wyvern/icons/uuencoded.gif
 wyvern/images/mwx-wyvern-banner.png
 wyvern/images/wyvern-banner.png
-wyvern/manual/access.html
+wyvern/manual/Wyvern-Manual.png
 wyvern/manual/acknowledgement.html
 wyvern/manual/appendix-A.html
-wyvern/manual/authentication.html
+wyvern/manual/appendix-B.html
 wyvern/manual/bibliography.html
-wyvern/manual/cgi.html
 wyvern/manual/commercial.html
 wyvern/manual/conclusion.html
 wyvern/manual/contents.html
@@ -102,31 +107,39 @@ 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/module.html
+wyvern/manual/mod_access.html
+wyvern/manual/mod_auth.html
+wyvern/manual/mod_autoindex.html
+wyvern/manual/mod_cgi.html
+wyvern/manual/mod_env.html
+wyvern/manual/mod_gzip.html
+wyvern/manual/mod_log.html
+wyvern/manual/mod_md5.html
+wyvern/manual/mod_ssi.html
 wyvern/manual/setup.html
-wyvern/manual/ssi.html
+wyvern/manual/security.html
 wyvern/manual/ssl.html
-wyvern/manual/syslog.html
+wyvern/manual/vhost.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/log.mod
-wyvern/modules/moredir.mod
-wyvern/modules/newdir.mod
-wyvern/modules/newlog.mod
-wyvern/modules/ssi.mod
+wyvern/modules/mod_access.so
+wyvern/modules/mod_auth_db.so
+wyvern/modules/mod_auth_dbm.so
+wyvern/modules/mod_autoindex.so
+wyvern/modules/mod_cgi.so
+wyvern/modules/mod_env.so
+wyvern/modules/mod_gzip.so
+wyvern/modules/mod_log.so
+wyvern/modules/mod_md5.so
+wyvern/modules/mod_rcgi.so
+wyvern/modules/mod_ssi.so
 wyvern/samples/dot.waccess
 wyvern/samples/dot.wpasswd
 wyvern/samples/hosts.allow
@@ -134,6 +147,7 @@ wyvern/samples/missing.html
 wyvern/style/default.css
 wyvern/sbin/wyvern
 wyvern/sbin/wyvernctl
+wyvern/sbin/suexec
 @comment @dirrm wyvern/bin
 @comment @dirrm wyvern/cache
 @comment @dirrm wyvern/cgi-bin
@@ -143,6 +157,7 @@ wyvern/sbin/wyvernctl
 @comment @dirrm wyvern/htdocs
 @comment @dirrm wyvern/icons
 @comment @dirrm wyvern/images
+@comment @dirrm wyvern/include
 @comment @dirrm wyvern/libexec
 @comment @dirrm wyvern/logs
 @comment @dirrm wyvern/manual