From f417e17b4c1327c2311f330ce5646e780c9e07bf Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 12 Nov 2013 22:15:08 +0000
Subject: [PATCH] - Update to 2.1.3

  Release notes:

  * Installation target 'make install' restored to its previous
    functionality (hence the whole module and packages are installed) by
    making it depend on two targets install-binaries and install-packages
  * New variant 'parse -string' to parse templates stored in strings
  * Improved safety of command ::rivet::parray by escaping SGML characters
    in the output
  * Improved detection of SELECT queries in ::DIO::Mysql
  * Various fixes in package Calendar
  * Changed names of deprecated variables in autotools scripts

PR:		183743
Submitted by:	gahr@
Approved by:	maintainer
---
 www/mod_rivet/Makefile | 23 +++++++++--------------
 www/mod_rivet/distinfo |  4 ++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 8586180cd392..3f6f13884acb 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	www tcl
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tcl/rivet
@@ -16,21 +16,16 @@ LICENSE=	AL2
 LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
 USE_APACHE=	22+
-USE_TCL=	85+
+USE_AUTOTOOLS=	aclocal automake
 USE_LDCONFIG=	${PREFIX}/lib/rivet
+USES+=		gmake tcl:85+
 
-USES=		gmake
-GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install
 
-INSTALL_TARGET=	install install-packages
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-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
+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' \
@@ -51,4 +46,4 @@ post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===================================================="
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_rivet/distinfo b/www/mod_rivet/distinfo
index d2c3bc759574..48b17498015f 100644
--- a/www/mod_rivet/distinfo
+++ b/www/mod_rivet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.1.2.tar.gz) = 286c9bbc57031692c048213d91169eb563fb233d28d1b6911b3ecf7aba87ecc6
-SIZE (rivet-2.1.2.tar.gz) = 1110383
+SHA256 (rivet-2.1.3.tar.gz) = 56220f45bcd5387d2299f026ecdb49825efb11207ec4859c91391d61263c1769
+SIZE (rivet-2.1.3.tar.gz) = 1365177