Index: head/www/mod_rivet/Makefile
===================================================================
--- head/www/mod_rivet/Makefile	(revision 383558)
+++ head/www/mod_rivet/Makefile	(revision 383559)
@@ -1,50 +1,49 @@
 # Created by: Peter Lai <cowbert@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	www tcl
-MASTER_SITES=		${MASTER_SITE_APACHE}
+MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tcl/rivet
-DISTNAME=		rivet-${PORTVERSION}
+DISTNAME=	rivet-${PORTVERSION}
 
 MAINTAINER=	jeff.lawson@flightaware.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
 GNU_CONFIGURE=	yes
 USE_APACHE=	22+
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 USES+=		gmake libtool tcl:85+
 
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--with-apache-version=2 \
 		--prefix=${PREFIX} --with-apxs=${APXS} \
 		--with-tcl=${TCL_LIBDIR} --with-tclsh=${TCLSH} \
 		--with-rivet-target-dir=${PREFIX}/lib/rivet
 
 post-patch:
 	${REINPLACE_CMD}  -e 's|`$${apxs_found} -q LIBEXECDIR`|${PREFIX}/${APACHEMODDIR}|g' \
 		${WRKSRC}/configure
 
 post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===================================================="
 	@${ECHO_MSG} "Remember to modify your apache configuration file"
 	@${ECHO_MSG} "to load mod_rivet and set the appropriate handlers:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "LoadModule rivet_module ${APACHEMODDIR}/mod_rivet.so"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "AddType application/x-httpd-rivet .rvt"
 	@${ECHO_MSG} "AddType application/x-rivet-tcl .tcl"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Visit http://tcl.apache.org/rivet/ for documentation"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===================================================="
 
 .include <bsd.port.mk>
Index: head/www/mod_rivet/distinfo
===================================================================
--- head/www/mod_rivet/distinfo	(revision 383558)
+++ head/www/mod_rivet/distinfo	(revision 383559)
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.2.0.tar.gz) = 80b04505aeab8928bfacf63d2b9af1fd3ef17b07df54bb5c299ab95eed00814a
-SIZE (rivet-2.2.0.tar.gz) = 1247211
+SHA256 (rivet-2.2.1.tar.gz) = d08e266880d00b4537ba7ee5bbfb3d8ed4c5031d3c9fb09e95a476cd059f57c2
+SIZE (rivet-2.2.1.tar.gz) = 1176640
Index: head/www/mod_rivet/pkg-plist
===================================================================
--- head/www/mod_rivet/pkg-plist	(revision 383558)
+++ head/www/mod_rivet/pkg-plist	(revision 383559)
@@ -1,73 +1,60 @@
 lib/rivet/init.tcl
 lib/rivet/librivetlib.so
 lib/rivet/librivetparser.so
 lib/rivet/packages/README
 lib/rivet/packages/calendar/calendar.tcl
 lib/rivet/packages/commserver/commserver.tcl
 lib/rivet/packages/commserver/server.tcl
 lib/rivet/packages/dio/aida.tcl
 lib/rivet/packages/dio/dio.tcl
 lib/rivet/packages/dio/dio_Mysql.tcl
 lib/rivet/packages/dio/dio_Oracle.tcl
 lib/rivet/packages/dio/dio_Postgresql.tcl
 lib/rivet/packages/dio/dio_Sqlite.tcl
 lib/rivet/packages/dio/dio_Tdbc.tcl
 lib/rivet/packages/dio/diodisplay.tcl
 lib/rivet/packages/dio/sql.tcl
 lib/rivet/packages/dtcl/dtcl.tcl
 lib/rivet/packages/entities/entities.tcl
 lib/rivet/packages/form/form.tcl
 lib/rivet/packages/form/form2.tcl
 lib/rivet/packages/rivet_ncgi/rivet_ncgi.tcl
 lib/rivet/packages/session/README.txt
 lib/rivet/packages/session/session-class.tcl
 lib/rivet/packages/session/session-create-mysql.sql
 lib/rivet/packages/session/session-create-oracle.sql
 lib/rivet/packages/session/session-create-postgresql.sql
 lib/rivet/packages/session/session-create-sqlite.sql
 lib/rivet/packages/session/session-demo.rvt
 lib/rivet/packages/session/session-drop.sql
 lib/rivet/packages/session/session-httpd.conf
 lib/rivet/packages/session/session-purge-mysql.sql
 lib/rivet/packages/simpledb/simpledb.tcl
 lib/rivet/packages/simpledb/simpledb.test
 lib/rivet/packages/tclrivet/README
 lib/rivet/packages/tclrivet/parse.tcl
 lib/rivet/packages/tclrivet/tclrivet.tcl
 lib/rivet/packages/tclrivet/tclrivetparser.tcl
 lib/rivet/pkgIndex.tcl
 lib/rivet/rivet-tcl/README
 lib/rivet/rivet-tcl/cookie.tcl
 lib/rivet/rivet-tcl/debug.tcl
 lib/rivet/rivet-tcl/html.tcl
 lib/rivet/rivet-tcl/http_accept.tcl
 lib/rivet/rivet-tcl/import_keyvalue_pairs.tcl
 lib/rivet/rivet-tcl/import_switch_args.tcl
 lib/rivet/rivet-tcl/lempty.tcl
 lib/rivet/rivet-tcl/lmatch.tcl
 lib/rivet/rivet-tcl/load_cookies.tcl
 lib/rivet/rivet-tcl/load_response.tcl
 lib/rivet/rivet-tcl/parray.tcl
 lib/rivet/rivet-tcl/parray_table.tcl
 lib/rivet/rivet-tcl/putsnnl.tcl
 lib/rivet/rivet-tcl/random.tcl
 lib/rivet/rivet-tcl/read_file.tcl
+lib/rivet/rivet-tcl/redirect.tcl
 lib/rivet/rivet-tcl/rivet_command_document.tcl
 lib/rivet/rivet-tcl/tclIndex
 lib/rivet/rivet-tcl/wrap.tcl
 lib/rivet/rivet-tcl/xml.tcl
 %%APACHEMODDIR%%/mod_rivet.so
-@dirrm lib/rivet/rivet-tcl
-@dirrm lib/rivet/packages/tclrivet
-@dirrm lib/rivet/packages/simpledb
-@dirrm lib/rivet/packages/session
-@dirrm lib/rivet/packages/rivet_ncgi
-@dirrm lib/rivet/packages/form
-@dirrm lib/rivet/packages/entities
-@dirrm lib/rivet/packages/dtcl
-@dirrm lib/rivet/packages/dio
-@dirrm lib/rivet/packages/commserver
-@dirrm lib/rivet/packages/calendar
-@dirrm lib/rivet/packages
-@dirrm lib/rivet
-@dirrmtry %%APACHEMODDIR%%