Bug 180444 - Update www/mod_rivet port to latest version
Summary: Update www/mod_rivet port to latest version
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Olli Hauer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-10 19:10 UTC by jeff.lawson
Modified: 2013-08-19 06:20 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description jeff.lawson 2013-07-10 19:10:00 UTC

    
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-10 21:41:59 UTC
Responsible Changed
From-To: freebsd-ports-bugs->apache

apache@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-10 21:42:00 UTC
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
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-10 21:42:01 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Olli Hauer freebsd_committer freebsd_triage 2013-07-10 22:36:48 UTC
Responsible Changed
From-To: apache->ohauer

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+
Comment 5 jeff.lawson 2013-08-01 20:01:07 UTC
I'm fine with the adjustment of USE_TCL=85+.  FreeBSD has been using Tcl 8.5 as its default version for quite a while now, so it should not be an issue for users.  What is the next step?
Comment 6 Peter Lai 2013-08-06 14:01:09 UTC
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
Comment 7 Olli Hauer 2013-08-19 00:04:03 UTC
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
Comment 8 jeff.lawson 2013-08-19 01:42:11 UTC
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+
Comment 9 dfilter service freebsd_committer freebsd_triage 2013-08-19 06:10:58 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"
Comment 10 Olli Hauer freebsd_committer freebsd_triage 2013-08-19 06:18:18 UTC
State Changed
From-To: feedback->closed

Committed!