From e8c6ab42c6cf81ec14e7cf934fec9f65fbcd5830 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 28 May 2015 06:13:03 +0000
Subject: - Update to 2.2.3 - Convert munch of Makefile echo's to pkg-mesage -
 Add LICENSE_FILE - Silence post-patch

PR:		200396
Submitted by:	jeff@bovine.net (maintainer)
---
 www/mod_rivet/Makefile             | 22 +++++-----------------
 www/mod_rivet/distinfo             |  4 ++--
 www/mod_rivet/files/pkg-message.in | 13 +++++++++++++
 3 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 www/mod_rivet/files/pkg-message.in

(limited to 'www')

diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 0484ff045ad7..cf4803d18b2f 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	www tcl
 MASTER_SITES=	APACHE/tcl/rivet
 DISTNAME=	rivet-${PORTVERSION}
@@ -11,6 +11,7 @@ MAINTAINER=	jeff.lawson@flightaware.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
@@ -21,28 +22,15 @@ USES+=		gmake libtool tcl:85+
 
 INSTALL_TARGET=	install-strip
 
+SUB_FILES=	pkg-message
+
 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' \
+	@${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>
diff --git a/www/mod_rivet/distinfo b/www/mod_rivet/distinfo
index d7be69e20fd8..6292716fcd40 100644
--- a/www/mod_rivet/distinfo
+++ b/www/mod_rivet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rivet-2.2.2.tar.gz) = 693ac67ad1af5576968fe6d274e8e518ad8cc06a5fa2c6e8b958f24636c55692
-SIZE (rivet-2.2.2.tar.gz) = 1177800
+SHA256 (rivet-2.2.3.tar.gz) = d5f6cae2a09999e59f3f7eef73d55f50ab29ee4277c92c5e6e50e4b165fc7d16
+SIZE (rivet-2.2.3.tar.gz) = 1171217
diff --git a/www/mod_rivet/files/pkg-message.in b/www/mod_rivet/files/pkg-message.in
new file mode 100644
index 000000000000..aa96b66df748
--- /dev/null
+++ b/www/mod_rivet/files/pkg-message.in
@@ -0,0 +1,13 @@
+
+====================================================
+Remember to modify your apache configuration file
+to load mod_rivet and set the appropriate handlers:
+
+LoadModule rivet_module %%APACHEMODDIR%%/mod_rivet.so
+
+AddType application/x-httpd-rivet .rvt
+AddType application/x-rivet-tcl .tcl
+
+Visit http://tcl.apache.org/rivet/ for documentation
+
+====================================================
-- 
cgit v1.2.3