3 files changed, 52 insertions, 59 deletions

diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 3e1cfd9cbc35..86bbdb2f2dfd 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.2
 CATEGORIES=	www tcl
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tcl/rivet
@@ -16,9 +15,10 @@ DISTNAME=		rivet-${PORTVERSION}
 MAINTAINER=	cowbert@gmail.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 
-WRKSRC=			${WRKDIR}/rivet-${PORTVERSION}
+WRKSRC=			${WRKDIR}/libapache2-mod-rivet-${PORTVERSION}
 
 MAKE_JOBS_SAFE=	yes
+LICENSE=		ASL
 
 USE_APACHE=	2.2+
 USE_AUTOTOOLS=	automake autoconf
@@ -34,18 +34,16 @@ CONFIGURE_ARGS+=	--with-apache-version=2 \
 			--with-tcl=${TCL_LIBDIR} --with-tclsh=${TCLSH} \
 			--with-rivet-target-dir=${PREFIX}/lib/rivet
 
-pre-configure:
-	@${ECHO_MSG} "Update dist install-sh with one from automake..."
-	${CP} -f ${AUTOMAKE_DIR}/install-sh ${WRKSRC}/tclconfig/install-sh
-	cd ${WRKSRC} && ${AUTORECONF} -v
-
 post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===================================================="
 	@${ECHO_MSG} "Remember to modify your apache configuration file
-	@${ECHO_MSG} "to load mod_rivet:"
+	@${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} "LoadModule mod_rivet ${APACHEMODDIR}/mod_rivet.so"
+	@${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} ""
diff --git a/www/mod_rivet/distinfo b/www/mod_rivet/distinfo
index 757a1bc3045d..60276cfa8e1a 100644
--- a/www/mod_rivet/distinfo
+++ b/www/mod_rivet/distinfo
@@ -1,3 +1,2 @@
-MD5 (rivet-2.0.0.tar.gz) = d1965b51046d8142735a092930b45b41
-SHA256 (rivet-2.0.0.tar.gz) = 2261ea6c18b99664c4a30b0a9c7a3cd47ae9a683d542fbb7c8ca561112b98097
-SIZE (rivet-2.0.0.tar.gz) = 1426089
+SHA256 (rivet-2.0.2.tar.gz) = 69eff25da56dfede9069f7c2bfbd4cba6e54c1c4a600c73c338206ccc951a47f
+SIZE (rivet-2.0.2.tar.gz) = 997406
diff --git a/www/mod_rivet/pkg-plist b/www/mod_rivet/pkg-plist
index be1f1b9d7eb4..24dc3217790f 100644
--- a/www/mod_rivet/pkg-plist
+++ b/www/mod_rivet/pkg-plist
@@ -1,63 +1,58 @@
 %%APACHEMODDIR%%/mod_rivet.la
 %%APACHEMODDIR%%/mod_rivet.so
-lib/rivet/librivet.so
+lib/rivet/README
+lib/rivet/init.tcl
 lib/rivet/librivet.la
-lib/rivet/librivetparser.so
+lib/rivet/librivet.so
 lib/rivet/librivetparser.la
-lib/rivet/rivet-tcl/wrap.tcl
-lib/rivet/rivet-tcl/import_keyvalue_pairs.tcl
-lib/rivet/rivet-tcl/read_file.tcl
-lib/rivet/rivet-tcl/rivet_command_document.tcl
-lib/rivet/rivet-tcl/html.tcl
-lib/rivet/rivet-tcl/lassign.tcl
-lib/rivet/rivet-tcl/incr0.tcl
-lib/rivet/rivet-tcl/load_cookies.tcl
-lib/rivet/rivet-tcl/parray.tcl
-lib/rivet/rivet-tcl/tclIndex
-lib/rivet/rivet-tcl/README
-lib/rivet/rivet-tcl/lmatch.tcl
-lib/rivet/rivet-tcl/lempty.tcl
-lib/rivet/rivet-tcl/cookie.tcl
-lib/rivet/rivet-tcl/load_response.tcl
-lib/rivet/rivet-tcl/import_switch_args.tcl
-lib/rivet/rivet-tcl/debug.tcl
-lib/rivet/rivet-tcl/random.tcl
-lib/rivet/packages/commserver/server.tcl
+lib/rivet/librivetparser.so
+lib/rivet/packages/README
+lib/rivet/packages/calendar/calendar.tcl
 lib/rivet/packages/commserver/commserver.tcl
-lib/rivet/packages/session/session-purge-mysql.sql
-lib/rivet/packages/session/session-drop.sql
+lib/rivet/packages/commserver/server.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/diodisplay.tcl
+lib/rivet/packages/dtcl/dtcl.tcl
+lib/rivet/packages/form/form.tcl
+lib/rivet/packages/rivet_ncgi/rivet_ncgi.tcl
 lib/rivet/packages/session/README.txt
-lib/rivet/packages/session/pkgIndex.tcl
+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-httpd.conf
-lib/rivet/packages/session/session-class.tcl
 lib/rivet/packages/session/session-create.sql
 lib/rivet/packages/session/session-demo.rvt
-lib/rivet/packages/tclrivet/tclrivet.tcl
-lib/rivet/packages/tclrivet/pkgIndex.tcl
+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/packages/simpledb/pkgIndex.tcl
-lib/rivet/packages/simpledb/simpledb.test
-lib/rivet/packages/simpledb/simpledb.tcl
-lib/rivet/packages/dtcl/pkgIndex.tcl
-lib/rivet/packages/dtcl/dtcl.tcl
-lib/rivet/packages/rivet_ncgi/rivet_ncgi.tcl
-lib/rivet/packages/dio/pkgIndex.tcl
-lib/rivet/packages/dio/dio_Oracle.tcl
-lib/rivet/packages/dio/dio_Sqlite.tcl
-lib/rivet/packages/dio/dio_Postgresql.tcl
-lib/rivet/packages/dio/dio.tcl
-lib/rivet/packages/dio/dio_Mysql.tcl
-lib/rivet/packages/dio/diodisplay.tcl
-lib/rivet/packages/form/form.tcl
-lib/rivet/packages/form/pkgIndex.tcl
-lib/rivet/packages/README
 lib/rivet/pkgIndex.tcl
-lib/rivet/init.tcl
-lib/rivet/README
+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/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/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
 @dirrm lib/rivet/packages/tclrivet
 @dirrm lib/rivet/packages/simpledb
 @dirrm lib/rivet/packages/session
@@ -66,6 +61,7 @@ lib/rivet/README
 @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/rivet-tcl
 @dirrm lib/rivet