From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 20 07:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A36E3DA4 for ; Tue, 20 Aug 2013 07:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 83EF12843 for ; Tue, 20 Aug 2013 07:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7K7K08O060018 for ; Tue, 20 Aug 2013 07:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7K7K0Bx060017; Tue, 20 Aug 2013 07:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 Aug 2013 07:20:00 GMT Resent-Message-Id: <201308200720.r7K7K0Bx060017@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pietro Cerutti Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 646BEAB8 for ; Tue, 20 Aug 2013 07:13:34 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 41FF927F5 for ; Tue, 20 Aug 2013 07:13:34 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7K7DYOt060132 for ; Tue, 20 Aug 2013 07:13:34 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7K7DY3A060131; Tue, 20 Aug 2013 07:13:34 GMT (envelope-from nobody) Message-Id: <201308200713.r7K7DY3A060131@oldred.freebsd.org> Date: Tue, 20 Aug 2013 07:13:34 GMT From: Pietro Cerutti To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181421: [patch] www/mod_rivet -- update to 2.1.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 07:20:00 -0000 >Number: 181421 >Category: ports >Synopsis: [patch] www/mod_rivet -- update to 2.1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 20 07:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: >Organization: The FreeBSD Project >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 324400) +++ Makefile (working copy) @@ -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 @@ -16,26 +15,54 @@ LIB_DEPENDS= itcl:${PORTSDIR}/lang/itcl +OPTIONS_DEFINE= IMP_NS EXP_CMD DOCS PACKAGES +OPTIONS_DEFAULT=IMP_NS EXP_CMD +IMP_NS_DESC= Import the ::rivet namespace +EXP_CMD_DESC= Export commands from the ::rivet namespace +PACKAGES_DESC= Install additional packages + USE_APACHE= 22+ -USE_TCL= 84+ +USE_TCL= 86 USE_LDCONFIG= ${PREFIX}/lib/rivet MAKE_JOBS_SAFE= yes GMAKE= yes GNU_CONFIGURE= yes +INSTALL_TARGET= install -.include +PORTDOCS= * -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 +.include +.if !${PORT_OPTIONS:MIMP_NS} +CONFIGURE_ARGS+=--disable-import-rivet-commands +.endif + +.if !${PORT_OPTIONS:MEXP_CMD} +CONFIGURE_ARGS+=--disable-rivet-commands-export +.endif + +.if ${PORT_OPTIONS:MPACKAGES} +PLIST_SUB+= PACKAGES="" +INSTALL_TARGET+=install-packages +.else +PLIST_SUB+= PACKAGES="@comment " +.endif + +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' \ ${WRKSRC}/configure.ac ${WRKSRC}/configure post-install: +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + @cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${DOCSDIR} +.endif @${ECHO_MSG} "" @${ECHO_MSG} "====================================================" @${ECHO_MSG} "Remember to modify your apache configuration file" @@ -50,4 +77,4 @@ @${ECHO_MSG} "" @${ECHO_MSG} "====================================================" -.include +.include Index: distinfo =================================================================== --- distinfo (revision 324400) +++ distinfo (working copy) @@ -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 Index: pkg-plist =================================================================== --- pkg-plist (revision 324400) +++ pkg-plist (working copy) @@ -1,68 +1,70 @@ %%APACHEMODDIR%%/mod_rivet.so -lib/rivet/README +lib/rivet/librivetlib.so +lib/rivet/pkgIndex.tcl +lib/rivet/librivetparser.so lib/rivet/init.tcl -lib/rivet/librivet.so -lib/rivet/librivetparser.so -lib/rivet/packages/README -lib/rivet/packages/calendar/calendar.tcl -lib/rivet/packages/commserver/commserver.tcl -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/entities/entities.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/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-demo.rvt -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/pkgIndex.tcl -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/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/read_file.tcl +lib/rivet/rivet-tcl/load_response.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/putsnnl.tcl lib/rivet/rivet-tcl/parray_table.tcl lib/rivet/rivet-tcl/random.tcl -lib/rivet/rivet-tcl/read_file.tcl +lib/rivet/rivet-tcl/load_cookies.tcl +lib/rivet/rivet-tcl/html.tcl lib/rivet/rivet-tcl/rivet_command_document.tcl +lib/rivet/rivet-tcl/cookie.tcl +lib/rivet/rivet-tcl/README +lib/rivet/rivet-tcl/parray.tcl lib/rivet/rivet-tcl/tclIndex +lib/rivet/rivet-tcl/http_accept.tcl lib/rivet/rivet-tcl/wrap.tcl -@dirrm lib/rivet/packages/tclrivet -@dirrm lib/rivet/packages/simpledb -@dirrm lib/rivet/packages/session -@dirrm lib/rivet/packages/rivet_ncgi -@dirrm lib/rivet/packages/form -@dirrm lib/rivet/packages/entities -@dirrm lib/rivet/packages/dtcl -@dirrm lib/rivet/packages/dio -@dirrm lib/rivet/packages/commserver -@dirrm lib/rivet/packages/calendar -@dirrm lib/rivet/packages +lib/rivet/rivet-tcl/xml.tcl +lib/rivet/rivet-tcl/import_switch_args.tcl +lib/rivet/rivet-tcl/import_keyvalue_pairs.tcl +lib/rivet/rivet-tcl/debug.tcl +lib/rivet/rivet-tcl/lmatch.tcl +%%PACKAGES%%lib/rivet/packages/README +%%PACKAGES%%lib/rivet/packages/calendar/calendar.tcl +%%PACKAGES%%lib/rivet/packages/commserver/commserver.tcl +%%PACKAGES%%lib/rivet/packages/commserver/server.tcl +%%PACKAGES%%lib/rivet/packages/dio/dio.tcl +%%PACKAGES%%lib/rivet/packages/dio/dio_Mysql.tcl +%%PACKAGES%%lib/rivet/packages/dio/dio_Oracle.tcl +%%PACKAGES%%lib/rivet/packages/dio/dio_Postgresql.tcl +%%PACKAGES%%lib/rivet/packages/dio/dio_Sqlite.tcl +%%PACKAGES%%lib/rivet/packages/dio/diodisplay.tcl +%%PACKAGES%%lib/rivet/packages/dtcl/dtcl.tcl +%%PACKAGES%%lib/rivet/packages/entities/entities.tcl +%%PACKAGES%%lib/rivet/packages/form/form.tcl +%%PACKAGES%%lib/rivet/packages/form/form2.tcl +%%PACKAGES%%lib/rivet/packages/rivet_ncgi/rivet_ncgi.tcl +%%PACKAGES%%lib/rivet/packages/session/README.txt +%%PACKAGES%%lib/rivet/packages/session/session-class.tcl +%%PACKAGES%%lib/rivet/packages/session/session-create-mysql.sql +%%PACKAGES%%lib/rivet/packages/session/session-create-oracle.sql +%%PACKAGES%%lib/rivet/packages/session/session-create-postgresql.sql +%%PACKAGES%%lib/rivet/packages/session/session-create-sqlite.sql +%%PACKAGES%%lib/rivet/packages/session/session-demo.rvt +%%PACKAGES%%lib/rivet/packages/session/session-drop.sql +%%PACKAGES%%lib/rivet/packages/session/session-httpd.conf +%%PACKAGES%%lib/rivet/packages/session/session-purge-mysql.sql +%%PACKAGES%%lib/rivet/packages/simpledb/simpledb.tcl +%%PACKAGES%%lib/rivet/packages/simpledb/simpledb.test +%%PACKAGES%%lib/rivet/packages/tclrivet/README +%%PACKAGES%%lib/rivet/packages/tclrivet/parse.tcl +%%PACKAGES%%lib/rivet/packages/tclrivet/tclrivet.tcl +%%PACKAGES%%lib/rivet/packages/tclrivet/tclrivetparser.tcl @dirrm lib/rivet/rivet-tcl @dirrm lib/rivet +%%PACKAGES%%@dirrm lib/rivet/packages/tclrivet +%%PACKAGES%%@dirrm lib/rivet/packages/simpledb +%%PACKAGES%%@dirrm lib/rivet/packages/session +%%PACKAGES%%@dirrm lib/rivet/packages/rivet_ncgi +%%PACKAGES%%@dirrm lib/rivet/packages/form +%%PACKAGES%%@dirrm lib/rivet/packages/entities +%%PACKAGES%%@dirrm lib/rivet/packages/dtcl +%%PACKAGES%%@dirrm lib/rivet/packages/dio +%%PACKAGES%%@dirrm lib/rivet/packages/commserver +%%PACKAGES%%@dirrm lib/rivet/packages/calendar +%%PACKAGES%%@dirrm lib/rivet/packages +%%PACKAGES%%@dirrm lib/rivet/ >Release-Note: >Audit-Trail: >Unformatted: