- Update to 2.2.7

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

10 files changed, 293 insertions, 169 deletions

diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index 625d090f4d88..ba9fd9bc7ca8 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -6,44 +6,97 @@
 #
 
 PORTNAME=	wyvern
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.7
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.MysticWALL.COM/download/
 
 MAINTAINER=	kouichi@MysticWALL.COM
-COMMENT=	Simple/powerful/lightweight/secure/embed-able HTTP server
+COMMENT=	Small/powerful/lightweight/secure/embeddable HTTP server
 
-USE_BZIP2=		yes
-USE_OPENSSL=		yes
-USE_GMAKE=		yes
-USE_AUTOTOOLS=	autoconf:259
+LIB_DEPENDS=	sxml.1:${PORTSDIR}/textproc/sxml
 
-NO_MTREE=		yes
+DOCSRC=		${WRKSRC}/docs
 
-PREFIX=		${LOCALBASE}/wyvern
-CONFIGURE_ARGS=	--with-ssl=yes \
-		--with-ssl-includes="${OPENSSLINC}" \
-		--with-ssl-libraries="${OPENSSLLIB}"
-MAKE_ARGS=	rcdir="${LOCALBASE}/etc/rc.d"
+USE_RC_SUBR=	wyvern
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}/wyvern ${CONFIGURE_TARGET}
+USE_OPENSSL=	yes
+USE_BZIP2=	yes
+
+MAKE_ARGS=	rcdir="${PREFIX}/etc/rc.d"
+
+OPTIONS=	OPENSSL "OpenSSL support" off \
+		SQLITE3 "SQLite3 support" off \
+		POSTGRESQL "PostgreSQL support" off \
+		SUEXEC "SuExec support" off \
+		JAPANESE "Use Japanese error messages" off \
+		SYSCTL_PS "Get process status with sysctl" off \
+		SIMPLE_INDEXING "Use simple indexing mode" off \
+		STRICT_PARSING "Parse request/response headers strictly" off
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+=	--enable-ipv6
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=	--with-openssl=yes
+.endif
+
+.if defined(WITH_SQLITE3)
+CONFIGURE_ARGS+=	--with-sqlite3=yes
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3:install
+PLIST_SUB+=	SQLITE3=""
+.else
+PLIST_SUB+=	SQLITE3="@comment "
+.endif
+
+.if defined(WITH_POSTGRESQL)
+CONFIGURE_ARGS+=	--with-postgresql=yes
+LIB_DEPENDS+=	pq.5:${PORTSDIR}/databases/postgresql82-client:install
+PLIST_SUB+=	POSTGRESQL=""
+.else
+PLIST_SUB+=	POSTGRESQL="@comment "
+.endif
+
+.if defined(WITH_SUEXEC)
+CONFIGURE_ARGS+=	--enable-suexec
+.endif
+
+.if defined(WITH_JAPANESE)
+CONFIGURE_ARGS+=	--enable-jp-mesg
+.endif
+
+.if defined(WITH_SYSCTL_PS)
+CONFIGURE_ARGS+=	--enable-sysctl-ps
+.endif
+
+.if defined(WITH_SIMPLE_INDEXING)
+CONFIGURE_ARGS+=	--enable-simple-indexing
+.endif
+
+.if defined(WITH_STRICT_PARSING)
+CONFIGURE_ARGS+=	--enable-strict-parsing
 .endif
 
 post-extract:
-	${MV} ${WRKSRC}/htdocs/index.html ${WRKSRC}/htdocs/index.html-dist
+	@${MV} ${DOCSRC}/htdocs/index.html ${DOCSRC}/htdocs/index.html-dist
+	@${CP} -f ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
+	@${CP} -f ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}/lib
+	@${CHMOD} a+x ${WRKSRC}/config.guess ${WRKSRC}/config.sub ${WRKSRC}/lib/config.guess ${WRKSRC}/lib/config.sub
 
 post-install:
-	${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; \
+	${LN} -sf ${PREFIX}/wyvern/sbin/wyvern ${PREFIX}/sbin/
+	if [ ! -f ${PREFIX}/wyvern/htdocs/index.html ]; then \
+		${CP} -p ${PREFIX}/wyvern/htdocs/index.html-dist ${PREFIX}/wyvern/htdocs/index.html; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
 certificate:
-	cd ${PREFIX} && openssl req -config conf/ssl.cnf -new -x509 -nodes \
-		-out conf/wyvern.pem -keyout conf/wyvern.pem
+	if [ ! -d ${PREFIX}/wyvern/ssl ]; then \
+		${MKDIR} ${PREFIX}/wyvern/ssl; \
+	fi
+	cd ${PREFIX}/wyvern && \
+	openssl genrsa -des3 -rand /dev/random -out ssl/private.key 1024 && \
+	openssl rsa -in ssl/private.key -out ssl/server.key && \
+	openssl req -config conf/wyvern-ssl.cnf -new -key ssl/private.key \
+		-x509 -days 90 -out ssl/server.crt
 
 .include <bsd.port.post.mk>
diff --git a/www/wyvern/distinfo b/www/wyvern/distinfo
index 3bbf1b6f39df..cb2ec87685be 100644
--- a/www/wyvern/distinfo
+++ b/www/wyvern/distinfo
@@ -1,3 +1,3 @@
-MD5 (wyvern-2.1.2.tar.bz2) = c859a86344269a1ac0bf6f0da35fe632
-SHA256 (wyvern-2.1.2.tar.bz2) = 621353d7fe69e42c9d8e4e08fced6f948eed64e3b9c09574d3e261f09195b661
-SIZE (wyvern-2.1.2.tar.bz2) = 425115
+MD5 (wyvern-2.2.7.tar.bz2) = 90b7d351ea94fecdadf159c1e0a82a0d
+SHA256 (wyvern-2.2.7.tar.bz2) = 1fc47dfb20d82923f703793ff7f353a9f8a951e790b53a103622291b1ba6954b
+SIZE (wyvern-2.2.7.tar.bz2) = 470677
diff --git a/www/wyvern/files/patch-Makefile.in b/www/wyvern/files/patch-Makefile.in
index af8864ad304a..4bae4a1e1fb3 100644
--- a/www/wyvern/files/patch-Makefile.in
+++ b/www/wyvern/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- 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
+--- Makefile.in.orig	Tue Mar 23 21:38:25 2004
++++ Makefile.in	Thu Jun 17 00:46:35 2004
+@@ -47,7 +47,7 @@
  
- 
- ###############################################################################
+ install_conf=wyvern.conf wyvern.conf.ja mime.types mime.types.large mime.types.small
+ install_docs=LICENSE README LICENSE.ja README.ja SECURITY UPDATING
+-install_htdocs=index.html
++install_htdocs=index.html-dist
+ install_icons="*.gif"
+ install_images="*.png"
+ install_manual="*.png *.css *.html"
diff --git a/www/wyvern/files/patch-configure.in b/www/wyvern/files/patch-configure.in
deleted file mode 100644
index 6703e3747712..000000000000
--- a/www/wyvern/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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@
- 
--install_htdocs	  = index.html
-+install_htdocs	  = index.html-dist
- 
- 
- ###############################################################################
diff --git a/www/wyvern/files/patch-src_modules_auth.c b/www/wyvern/files/patch-src_modules_auth.c
deleted file mode 100644
index dce7c322d7f4..000000000000
--- a/www/wyvern/files/patch-src_modules_auth.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/modules/auth.c.orig
-+++ src/modules/auth.c
-@@ -44,6 +44,7 @@
- #include "config.h"
- #endif	/* HAVE_CONFIG_H */
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #if	HAVE_STDLIB_H
- #include <stdlib.h>
diff --git a/www/wyvern/files/patch-src_wyvern.h b/www/wyvern/files/patch-src_wyvern.h
deleted file mode 100644
index 45c74c558ab3..000000000000
--- a/www/wyvern/files/patch-src_wyvern.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/wyvern.h.orig
-+++ src/wyvern.h
-@@ -56,6 +56,7 @@
- #include <netdb.h>
- #if	USE_SSL
- #include <openssl/ssl.h>
-+#include <openssl/md5.h>
- #endif	/* USE_SSL */
- #include <sys/time.h>
- #include "status.h"
diff --git a/www/wyvern/files/wyvern.in b/www/wyvern/files/wyvern.in
new file mode 100644
index 000000000000..d80563d2e36e
--- /dev/null
+++ b/www/wyvern/files/wyvern.in
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: wyvern
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Define these wyvern_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/wyvern
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+wyvern_enable=${wyvern_enable:-"NO"}	# Enable wyvern
+
+. @RC_SUBR@
+
+name="wyvern"
+rcvar=`set_rcvar`
+command="@PREFIX@/sbin/wyvern"
+pidfile="/var/run/wyvern.pid"
+required_files="/usr/local/wyvern/conf/wyvern.conf"
+start_cmd="wyvern_start"
+stop_postcmd="wyvern_poststop"
+
+wyvern_start() {
+	${command} -r ${required_files}
+}
+
+wyvern_restart() {
+	if [ -f ${pidfile} ]; then
+		kill `cat ${pidfile}` > /dev/null 2>&1
+		rm -f ${pidfile}
+	fi
+	${command} -r ${required_files}
+}
+
+wyvern_poststop() {
+	if [ -f ${pidfile} ]; then
+		rm -f ${pidfile}
+	fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/www/wyvern/pkg-descr b/www/wyvern/pkg-descr
index a5276fef9443..b381a490187d 100644
--- a/www/wyvern/pkg-descr
+++ b/www/wyvern/pkg-descr
@@ -3,15 +3,16 @@ 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:
 
-  o  single-process server using select(2) and non-blocking I/O,
+  o  single-process multi-threads server,
   o  HTTP/1.1 support (not fully implemented),
   o  host name based virtual hosting,
-  o  customizable error pages,
-  o  IPv6 communication (experimental),
+  o  customizable error pages and messages,
+  o  IPv6 communication (no support SSL),
   o  Secure Socket Layer (SSL) communication,
+  o  executable CGI program with SuExec mechanism,
   o  highly secure implementation,
-  o  MD5 encrypted password management with dbm,
-  o  ErrorLog logging with syslogd(8), and
+  o  many password management mechanism: db, dbm and SQLite3, PostgreSQL,
+  o  various logging method such as file, Unix pipe and networking, and
   o  extensible plug-in modules.
 
 Author:	Kouichi ABE (WALL) <kouichi@MysticWALL.COM>
diff --git a/www/wyvern/pkg-message b/www/wyvern/pkg-message
index 418130092f10..c95fa2a95c7c 100644
--- a/www/wyvern/pkg-message
+++ b/www/wyvern/pkg-message
@@ -4,4 +4,7 @@ and type:
 
 	make certificate
 
+And confirm "<certificate-file>" and "<certificate-key-file>"
+in wyvern.conf.
+
 ************************************************************
diff --git a/www/wyvern/pkg-plist b/www/wyvern/pkg-plist
index 372e4a5b3b0b..57718833c003 100644
--- a/www/wyvern/pkg-plist
+++ b/www/wyvern/pkg-plist
@@ -1,46 +1,106 @@
-@cwd %%LOCALBASE%%
-etc/rc.d/wyvern.sh
 sbin/wyvern
 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/sbin/wyvern
+wyvern/sbin/suexec
+wyvern/sbin/wyvernctl
 wyvern/include/wyvern.h
-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/printenv.rb
-@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
+wyvern/include/common.h
+wyvern/include/status.h
+wyvern/include/module.h
+wyvern/include/functions.h
+wyvern/include/wa.h
+wyvern/include/wc.h
+wyvern/include/wl.h
+wyvern/include/wm.h
+wyvern/include/wp.h
+wyvern/include/ws.h
+wyvern/include/wt-ssl.h
+wyvern/include/wt-sub.h
+wyvern/include/wt.h
+wyvern/include/wu.h
+wyvern/lib/libwt.a
+wyvern/lib/libwt.so.1
+wyvern/lib/libwt.so
+wyvern/lib/libwt_ssl.a
+wyvern/lib/libwt_ssl.so.1
+wyvern/lib/libwt_ssl.so
+wyvern/lib/libws.a
+wyvern/lib/libws.so.1
+wyvern/lib/libws.so
+wyvern/lib/libwu.a
+wyvern/lib/libwu.so.1
+wyvern/lib/libwu.so
+wyvern/lib/libwl.a
+wyvern/lib/libwl.so.1
+wyvern/lib/libwl.so
+wyvern/lib/libwc.a
+wyvern/lib/libwc.so.1
+wyvern/lib/libwc.so
+wyvern/lib/libwa.a
+wyvern/lib/libwa.so.1
+wyvern/lib/libwa.so
+wyvern/lib/libwm.a
+wyvern/lib/libwm.so.1
+wyvern/lib/libwm.so
+wyvern/lib/libwp.a
+wyvern/lib/libwp.so.1
+wyvern/lib/libwp.so
+wyvern/modules/libauth.so
+wyvern/modules/mod_env.so
+wyvern/modules/mod_md5.so
+wyvern/modules/mod_ident.so
+wyvern/modules/mod_info.so
+wyvern/modules/mod_access.so
+wyvern/modules/mod_auth.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_ssi.so
+wyvern/modules/mod_gzip.so
+%%SQLITE3%%wyvern/modules/mod_log_sqlite.so
+%%SQLITE3%%wyvern/modules/mod_auth_sqlite.so
+%%SQLITE3%%wyvern/modules/mod_access_sqlite.so
+%%POSTGRESQL%%wyvern/modules/mod_log_pgsql.so
+%%POSTGRESQL%%wyvern/modules/mod_auth_pgsql.so
 @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.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.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
+@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
+wyvern/conf/mime.types.large.sample
+wyvern/conf/mime.types.small.sample
+@unexec if cmp -s %D/wyvern/conf/wyvern-ssl.cnf %D/wyvern/conf/wyvern-ssl.cnf.sample; then rm -f %D/wyvern/conf/wyvern-ssl.cnf; fi
+wyvern/conf/wyvern-ssl.cnf.sample
+@exec [ ! -f %B/wyvern-ssl.cnf ] && cp %B/%f %B/wyvern-ssl.cnf
 wyvern/docs/LICENSE
-wyvern/docs/LICENSE.ja
-wyvern/docs/NEWS
 wyvern/docs/README
+wyvern/docs/LICENSE.ja
 wyvern/docs/README.ja
-wyvern/docs/README.module
-wyvern/docs/README.module.ja
 wyvern/docs/SECURITY
 wyvern/docs/UPDATING
+wyvern/examples/admin.conf
+wyvern/examples/admin_auth.sql
+wyvern/examples/admin_history.sql
+wyvern/examples/missing.html
+%%SQLITE3%%wyvern/examples/sqlite_log.sql
+%%SQLITE3%%wyvern/examples/sqlite_auth.sql
+%%SQLITE3%%wyvern/examples/sqlite_access.sql
+%%POSTGRESQL%%wyvern/examples/pgsql_log.sql
+%%POSTGRESQL%%wyvern/examples/pgsql_auth.sql
+wyvern/examples/waccess.conf
+wyvern/examples/wauth.conf
+wyvern/examples/wpasswd.xml
 @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
+wyvern/cgi-bin/printenv.cgi
+wyvern/cgi-bin/printenv.pl
+wyvern/cgi-bin/printenv.rb
 wyvern/icons/a.gif
 wyvern/icons/alert.black.gif
 wyvern/icons/alert.red.gif
@@ -95,75 +155,70 @@ wyvern/icons/unknown.gif
 wyvern/icons/uuencoded.gif
 wyvern/images/mwx-wyvern-banner.png
 wyvern/images/wyvern-banner.png
+wyvern/manual/manual.css
 wyvern/manual/Wyvern-Manual.png
-wyvern/manual/acknowledgement.html
-wyvern/manual/appendix-A.html
-wyvern/manual/appendix-B.html
-wyvern/manual/bibliography.html
-wyvern/manual/commercial.html
-wyvern/manual/conclusion.html
-wyvern/manual/contents.html
-wyvern/manual/copyright.html
-wyvern/manual/dbm.html
-wyvern/manual/faq.html
-wyvern/manual/features.html
+wyvern/manual/sponsor.png
+wyvern/manual/powerlogo.png
 wyvern/manual/index.html
-wyvern/manual/install.html
 wyvern/manual/introduction.html
+wyvern/manual/features.html
+wyvern/manual/security/index.html
+wyvern/manual/security/ssl.html
+wyvern/manual/security/suexec.html
+wyvern/manual/install/easy.html
+wyvern/manual/install/custom.html
+wyvern/manual/install/start.html
+wyvern/manual/config/index.html
+wyvern/manual/config/socket.html
+wyvern/manual/config/security.html
+wyvern/manual/config/ssl.html
+wyvern/manual/config/limits.html
+wyvern/manual/config/paths.html
+wyvern/manual/config/module.html
+wyvern/manual/config/host.html
+wyvern/manual/module/index.html
+wyvern/manual/module/mod_md5.html
+wyvern/manual/module/mod_access.html
+wyvern/manual/module/mod_auth.html
+wyvern/manual/module/mod_autoindex.html
+wyvern/manual/module/ports-index.png
+wyvern/manual/module/system-info.png
+wyvern/manual/module/mod_env.html
+wyvern/manual/module/mod_cgi.html
+wyvern/manual/module/mod_ssi.html
+wyvern/manual/module/mod_gzip.html
+wyvern/manual/module/mod_ident.html
+wyvern/manual/module/mod_info.html
 wyvern/manual/license.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/security.html
-wyvern/manual/ssl.html
-wyvern/manual/vhost.html
-wyvern/manual/wyvern-manual.png
-wyvern/manual/wyvern.css
-wyvern/manual/wyvern.html
-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
-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
-@comment @dirrm wyvern/conf
-@comment @dirrm wyvern/docs
-@comment @dirrm wyvern/etc
-@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
-@comment @dirrm wyvern/modules
-@comment @dirrm wyvern/samples
-@comment @dirrm wyvern/sbin
-@comment @dirrm wyvern/style
-@comment @dirrm wyvern
-@unexec find %D/wyvern -type d | sort -r | xargs rmdir || true
+wyvern/manual/conclusion.html
+wyvern/manual/bibliography.html
+wyvern/manual/acknowledgement.html
+wyvern/manual/appendix-A.html
+wyvern/manual/appendix-B.html
+wyvern/manual/appendix-C.html
+@dirrm wyvern/bin
+@dirrm wyvern/cgi-bin
+@dirrm wyvern/conf
+@dirrm wyvern/db
+@dirrm wyvern/docs
+@dirrm wyvern/etc
+@dirrm wyvern/examples
+@dirrm wyvern/htdocs
+@dirrm wyvern/icons
+@dirrm wyvern/images
+@dirrm wyvern/include
+@dirrm wyvern/lib
+@dirrm wyvern/libexec
+@dirrm wyvern/logs
+@dirrm wyvern/manual/config
+@dirrm wyvern/manual/install
+@dirrm wyvern/manual/module
+@dirrm wyvern/manual/security
+@dirrm wyvern/manual
+@dirrm wyvern/modules
+@dirrm wyvern/run
+@dirrm wyvern/sbin
+@dirrm wyvern/tmp
+@dirrm wyvern/cache
+@dirrm wyvern/styles
+@dirrm wyvern