3 files changed, 14 insertions, 12 deletions

diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 726ca9eec14e..ddea0b2e4a7f 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTVERSION=	2.1.2
 CATEGORIES=	www tcl
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tcl/rivet
@@ -14,15 +13,17 @@ COMMENT=	Embeds a Tcl interpreter in the Apache server
 
 LICENSE=	AL2
 
-LIB_DEPENDS=	itcl:${PORTSDIR}/lang/itcl
+LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
 USE_APACHE=	22+
-USE_TCL=	84+
+USE_TCL=	85+
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 
-GMAKE=		yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
+INSTALL_TARGET=	install install-packages
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--with-apache-version=2 \
diff --git a/www/mod_rivet/distinfo b/www/mod_rivet/distinfo
index 368cdc2167c1..d2c3bc759574 100644
--- a/www/mod_rivet/distinfo
+++ b/www/mod_rivet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.0.5.tar.gz) = 277e0c0af6fb9c0fd40e1650429a1e90034632f7f9c909702d271044a98bfc67
-SIZE (rivet-2.0.5.tar.gz) = 1349431
+SHA256 (rivet-2.1.2.tar.gz) = 286c9bbc57031692c048213d91169eb563fb233d28d1b6911b3ecf7aba87ecc6
+SIZE (rivet-2.1.2.tar.gz) = 1110383
diff --git a/www/mod_rivet/pkg-plist b/www/mod_rivet/pkg-plist
index 929d57c29f2c..274a648bceae 100644
--- a/www/mod_rivet/pkg-plist
+++ b/www/mod_rivet/pkg-plist
@@ -1,7 +1,6 @@
 %%APACHEMODDIR%%/mod_rivet.so
-lib/rivet/README
 lib/rivet/init.tcl
-lib/rivet/librivet.so
+lib/rivet/librivetlib.so
 lib/rivet/librivetparser.so
 lib/rivet/packages/README
 lib/rivet/packages/calendar/calendar.tcl
@@ -16,12 +15,14 @@ lib/rivet/packages/dio/diodisplay.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.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
@@ -40,19 +41,19 @@ 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/incr0.tcl
-lib/rivet/rivet-tcl/lassign.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/rivet_command_document.tcl
 lib/rivet/rivet-tcl/tclIndex
 lib/rivet/rivet-tcl/wrap.tcl
+lib/rivet/rivet-tcl/xml.tcl
 @dirrm lib/rivet/packages/tclrivet
 @dirrm lib/rivet/packages/simpledb
 @dirrm lib/rivet/packages/session