From jeff.lawson@gappi.hou.flightaware.com  Wed Jul 10 18:00:39 2013
Return-Path: <jeff.lawson@gappi.hou.flightaware.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id E2270BC1
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2013 18:00:38 +0000 (UTC)
	(envelope-from jeff.lawson@gappi.hou.flightaware.com)
Received: from gappi.hou.flightaware.com (gappi.hou.flightaware.com [IPv6:2600:c13:1002:4::1:70])
	by mx1.freebsd.org (Postfix) with ESMTP id B902F1151
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2013 18:00:38 +0000 (UTC)
Received: from gappi.hou.flightaware.com (localhost [127.0.0.1])
	by gappi.hou.flightaware.com (8.14.4/8.14.4) with ESMTP id r6AI0ahm030151
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2013 18:00:36 GMT
	(envelope-from jeff.lawson@gappi.hou.flightaware.com)
Received: (from jeff.lawson@localhost)
	by gappi.hou.flightaware.com (8.14.4/8.14.4/Submit) id r6AI0alV030150;
	Wed, 10 Jul 2013 18:00:36 GMT
	(envelope-from jeff.lawson)
Message-Id: <201307101800.r6AI0alV030150@gappi.hou.flightaware.com>
Date: Wed, 10 Jul 2013 18:00:36 GMT
From: Jeff Lawson <jeff.lawson@flightaware.com>
Reply-To: Jeff Lawson <jeff.lawson@flightaware.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update mod_rivet port to latest version
X-Send-Pr-Version: 3.113
X-GNATS-Notify: cowbert@gmail.com

>Number:         180444
>Category:       ports
>Synopsis:       Update www/mod_rivet port to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 10 18:10:00 UTC 2013
>Closed-Date:    Mon Aug 19 05:19:03 UTC 2013
>Last-Modified:  Mon Aug 19 05:20:00 UTC 2013
>Originator:     Jeff Lawson
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
FlightAware
>Environment:
System: FreeBSD gappi.hou.flightaware.com 8.0-STABLE FreeBSD 8.0-STABLE #0: Thu Feb 18 14:48:28 CST 2010 root@gappi.hou.flightaware.com:/usr/obj/usr/src/sys/GENERIC amd64


Apache mod_rivet released version 2.1.2 on June 30, 2012.
http://tcl.apache.org/rivet/static/rn-2-1.html

This simply updates the port to use the new version.


--- mod_rivet-212.diff begins here ---
diff -uw mod_rivet.orig/Makefile mod_rivet/Makefile
--- mod_rivet.orig/Makefile	2013-07-10 16:18:51.000000000 +0000
+++ mod_rivet/Makefile	2013-07-10 16:20:43.000000000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/www/mod_rivet/Makefile,v 1.15 2012/11/17 06:02:41 svnexp Exp $
 
 PORTNAME=	mod_rivet
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.2
 PORTREVISION=	1
 CATEGORIES=	www tcl
 MASTER_SITES=		${MASTER_SITE_APACHE}
@@ -24,6 +24,8 @@
 GMAKE=		yes
 GNU_CONFIGURE=	yes
 
+INSTALL_TARGET=	install install-packages
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--with-apache-version=2 \
diff -uw mod_rivet.orig/distinfo mod_rivet/distinfo
--- mod_rivet.orig/distinfo	2013-07-10 16:18:51.000000000 +0000
+++ mod_rivet/distinfo	2013-07-10 16:24:05.000000000 +0000
@@ -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 -uw mod_rivet.orig/pkg-plist mod_rivet/pkg-plist
--- mod_rivet.orig/pkg-plist	2013-07-10 16:18:51.000000000 +0000
+++ mod_rivet/pkg-plist	2013-07-10 17:53:12.000000000 +0000
@@ -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/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/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
--- mod_rivet-212.diff ends here ---


>Description:
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->apache 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jul 10 20:41:59 UTC 2013 
Responsible-Changed-Why:  
apache@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180444 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jul 10 20:42:01 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180444 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: cowbert@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/180444: Update www/mod_rivet port to latest version
Date: Wed, 10 Jul 2013 20:42:00 UT

 Maintainer of www/mod_rivet,
 
 Please note that PR ports/180444 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180444
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: apache->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Wed Jul 10 21:36:48 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

From Rivet 2.1: Release Notes 
> Rivet 2.1 works with the Apache Webserver version 2.x  
> (running the prefork MPM) and requires Tcl >= 8.5.11  

So the required TCL version should be adjusted. 

-USE_TCL=       84+ 
+USE_TCL=       85+ 



http://www.freebsd.org/cgi/query-pr.cgi?pr=180444 

From: Jeff Lawson <jeff.lawson@flightaware.com>
To: "bug-followup@FreeBSD.org" <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/180444: Update www/mod_rivet port to latest version
Date: Thu, 1 Aug 2013 19:01:07 +0000

 --_000_CE201AA1628B5jefflawsonflightawarecom_
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: quoted-printable
 
 I'm fine with the adjustment of USE_TCL=3D85+.  FreeBSD has been using Tcl =
 8.5 as its default version for quite a while now, so it should not be an is=
 sue for users.  What is the next step?
 
 --_000_CE201AA1628B5jefflawsonflightawarecom_
 Content-Type: text/html; charset="us-ascii"
 Content-ID: <A5F2B26199BB3D4C9637F58F7BFDA841@exch021.domain.local>
 Content-Transfer-Encoding: quoted-printable
 
 <html>
 <head>
 <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
 >
 </head>
 <body style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-lin=
 e-break: after-white-space; color: rgb(0, 0, 0); font-size: 14px; font-fami=
 ly: Calibri, sans-serif; ">
 <div>I'm fine with the adjustment of USE_TCL=3D85&#43;. &nbsp;FreeBSD has b=
 een using Tcl 8.5 as its default version for quite a while now, so it shoul=
 d not be an issue for users. &nbsp;What is the next step?</div>
 </body>
 </html>
 
 --_000_CE201AA1628B5jefflawsonflightawarecom_--

From: Peter Lai <cowbert@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/180444: Update www/mod_rivet port to latest version
Date: Tue, 6 Aug 2013 09:01:09 -0400

 maintainer approved
 
 On Wed, Jul 10, 2013 at 4:42 PM, Edwin Groothuis <edwin@freebsd.org> wrote:
 > Maintainer of www/mod_rivet,
 >
 > Please note that PR ports/180444 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180444
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org

From: olli hauer <ohauer@gmx.de>
To: bug-followup@FreeBSD.org, jeff.lawson@flightaware.com
Cc:  
Subject: Re: ports/180444: Update www/mod_rivet port to latest version
Date: Mon, 19 Aug 2013 01:04:03 +0200

 Hi Jeff,
 
 sorry for the delay ....
 
 I noticed that version 2.1.2 don't install rivert/packages any longer by default, so I added an option to allow installation of the packages.
 
 Please do a quick check of the following diff / shar
  http://people.freebsd.org/~ohauer/diffs/mod_rivet-2.1.2.diff
  http://people.freebsd.org/~ohauer/diffs/mod_rivet-2.1.2.shar
 
 At last you should decide if packages should be installed by default or optional.
 
 --
 Regards,
 olli

From: Jeff Lawson <jeff.lawson@flightaware.com>
To: olli hauer <ohauer@gmx.de>, "bug-followup@FreeBSD.org"
	<bug-followup@FreeBSD.org>
Cc:  
Subject: RE: ports/180444: Update www/mod_rivet port to latest version
Date: Mon, 19 Aug 2013 00:42:11 +0000

 My previous patch deployed both the packages and the binaries automatically=
 .
 
 +INSTALL_TARGET=3D	install install-packages
 
 There is no need to create a config option to allow packages to not be inst=
 alled.  It was introduced only as a way to allow the compiled binaries to b=
 e installed separately for the purposes of creating architecture-dependent =
 packages on some other operating systems.
 
 http://mail-archives.apache.org/mod_mbox/tcl-rivet-dev/201307.mbox/browser
 
 Please just keep the previous implementation of my original patch, plus the=
  USE_TCL=3D85+
 
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Mon Aug 19 05:18:18 UTC 2013 
State-Changed-Why:  
Committed! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180444 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180444: commit references a PR
Date: Mon, 19 Aug 2013 05:10:58 +0000 (UTC)

 Author: ohauer
 Date: Mon Aug 19 05:10:46 2013
 New Revision: 324942
 URL: http://svnweb.freebsd.org/changeset/ports/324942
 
 Log:
   - update to 2.1.2
   
   Changelog:
   http://tcl.apache.org/rivet/static/rn-2-1.html
   
   PR:		ports/180444
   Submitted by:	Jeff Lawson <jeff.lawson@flightaware.com>
   Approved by:	Peter Lai <cowbert@gmail.com> (maintainer)
 
 Modified:
   head/www/mod_rivet/Makefile
   head/www/mod_rivet/distinfo
   head/www/mod_rivet/pkg-plist
 
 Modified: head/www/mod_rivet/Makefile
 ==============================================================================
 --- head/www/mod_rivet/Makefile	Mon Aug 19 01:39:43 2013	(r324941)
 +++ head/www/mod_rivet/Makefile	Mon Aug 19 05:10:46 2013	(r324942)
 @@ -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
  
  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 \
 
 Modified: head/www/mod_rivet/distinfo
 ==============================================================================
 --- head/www/mod_rivet/distinfo	Mon Aug 19 01:39:43 2013	(r324941)
 +++ head/www/mod_rivet/distinfo	Mon Aug 19 05:10:46 2013	(r324942)
 @@ -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
 
 Modified: head/www/mod_rivet/pkg-plist
 ==============================================================================
 --- head/www/mod_rivet/pkg-plist	Mon Aug 19 01:39:43 2013	(r324941)
 +++ head/www/mod_rivet/pkg-plist	Mon Aug 19 05:10:46 2013	(r324942)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
