Index: head/www/mod_rivet/Makefile
===================================================================
--- head/www/mod_rivet/Makefile	(revision 413748)
+++ head/www/mod_rivet/Makefile	(revision 413749)
@@ -1,33 +1,33 @@
 # Created by: Peter Lai <cowbert@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.2.3
+PORTVERSION=	2.3.1
 CATEGORIES=	www tcl
 MASTER_SITES=	APACHE/tcl/rivet
 DISTNAME=	rivet-${PORTVERSION}
 
 MAINTAINER=	jeff.lawson@flightaware.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libitcl.so:lang/itcl
 
 USE_APACHE=	22+
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 USES+=		gmake libtool tcl:85+,tea
 
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=--with-apache-version=2 --with-apxs=${APXS} \
+CONFIGURE_ARGS+=--with-apxs=${APXS} \
 		--with-rivet-target-dir=${PREFIX}/lib/rivet
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`$${apxs_found} -q LIBEXECDIR`|${PREFIX}/${APACHEMODDIR}|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/www/mod_rivet/distinfo
===================================================================
--- head/www/mod_rivet/distinfo	(revision 413748)
+++ head/www/mod_rivet/distinfo	(revision 413749)
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.2.3.tar.gz) = d5f6cae2a09999e59f3f7eef73d55f50ab29ee4277c92c5e6e50e4b165fc7d16
-SIZE (rivet-2.2.3.tar.gz) = 1171217
+SHA256 (rivet-2.3.1.tar.gz) = d6b4dd70204fb8707cca1e0067e75bad689e7182d989d45f4aa17a870c2cbc40
+SIZE (rivet-2.3.1.tar.gz) = 1203555
Index: head/www/mod_rivet/pkg-plist
===================================================================
--- head/www/mod_rivet/pkg-plist	(revision 413748)
+++ head/www/mod_rivet/pkg-plist	(revision 413749)
@@ -1,60 +1,63 @@
 lib/rivet/init.tcl
 lib/rivet/librivetlib.so
 lib/rivet/librivetparser.so
 lib/rivet/packages/README
+lib/rivet/packages/asciiglyphs/asciiglyphs.tcl
 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/catch.tcl
 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/try.tcl
 lib/rivet/rivet-tcl/wrap.tcl
 lib/rivet/rivet-tcl/xml.tcl
 %%APACHEMODDIR%%/mod_rivet.so