From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 28 00:10:05 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD16616A422 for ; Mon, 28 Nov 2005 00:10:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D7AA43D6A for ; Mon, 28 Nov 2005 00:10:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAS0A2dO095740 for ; Mon, 28 Nov 2005 00:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAS0A2Kl095739; Mon, 28 Nov 2005 00:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 28 Nov 2005 00:10:02 GMT Resent-Message-Id: <200511280010.jAS0A2Kl095739@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, Rod Taylor Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1A7F16A41F for ; Mon, 28 Nov 2005 00:09:04 +0000 (GMT) (envelope-from rbt@home.rbt.ca) Received: from home.rbt.ca (216-154-14-116.dsl.look.ca [216.154.14.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id 793D543D5A for ; Mon, 28 Nov 2005 00:09:03 +0000 (GMT) (envelope-from rbt@home.rbt.ca) Received: from home.rbt.ca (localhost [127.0.0.1]) by home.rbt.ca (8.13.4/8.13.4) with ESMTP id jAS08a4V068892 for ; Sun, 27 Nov 2005 19:08:37 -0500 (EST) (envelope-from rbt@home.rbt.ca) Received: (from rbt@localhost) by home.rbt.ca (8.13.4/8.13.1/Submit) id jAS08aIH068891; Sun, 27 Nov 2005 19:08:36 -0500 (EST) (envelope-from rbt) Message-Id: <200511280008.jAS08aIH068891@home.rbt.ca> Date: Sun, 27 Nov 2005 19:08:36 -0500 (EST) From: Rod Taylor To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89649: MAINTAINER-UPDATE: www/bricolage upgrade X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rod Taylor List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 00:10:06 -0000 >Number: 89649 >Category: ports >Synopsis: MAINTAINER-UPDATE: www/bricolage upgrade >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Nov 28 00:10:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rod Taylor >Release: FreeBSD 6.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD home 6.0-RELEASE FreeBSD 6.0-RELEASE #13: Sat Nov 5 00:19:49 EST 2005 root@home:/usr/obj/usr/src/sys/HOME amd64 >Description: Upgrade bricolage from 1.8.6 to 1.8.8 -- primarily bug fixes and performance improvements. >How-To-Repeat: >Fix: --- bricolage.patch begins here --- diff -crN bricolage.orig/Makefile bricolage/Makefile *** bricolage.orig/Makefile Fri Nov 4 09:44:50 2005 --- bricolage/Makefile Sun Nov 27 14:56:07 2005 *************** *** 6,12 **** # PORTNAME= bricolage ! PORTVERSION= 1.8.6 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bricolage --- 6,12 ---- # PORTNAME= bricolage ! PORTVERSION= 1.8.8 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bricolage *************** *** 44,50 **** ${SITE_PERL}/MasonX/Interp/WithCallbacks.pm:${PORTSDIR}/www/p5-MasonX-Interp-WithCallbacks \ ${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \ ${SITE_PERL}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect - RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ ${BUILD_DEPENDS} --- 44,49 ---- *************** *** 57,63 **** # in the same order as found within inst/versions.txt # # Skip 1.8.5 ! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 USE_REINPLACE= yes PERL_CONFIGURE= yes --- 56,62 ---- # in the same order as found within inst/versions.txt # # Skip 1.8.5 ! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 1.8.7 1.8.8 USE_REINPLACE= yes PERL_CONFIGURE= yes diff -crN bricolage.orig/distinfo bricolage/distinfo *** bricolage.orig/distinfo Thu Sep 15 23:06:58 2005 --- bricolage/distinfo Sun Nov 27 14:33:28 2005 *************** *** 1,2 **** ! MD5 (bricolage-1.8.6.tar.gz) = 31471d279b8dc68b7ddc8f8282924f75 ! SIZE (bricolage-1.8.6.tar.gz) = 2543150 --- 1,3 ---- ! MD5 (bricolage-1.8.8.tar.gz) = 8546d21ddea434abcd33539c2b460ced ! SHA256 (bricolage-1.8.8.tar.gz) = 2b7f6c82b57281a25dde97b4621da75e87866498e423a61ac79b70662218697f ! SIZE (bricolage-1.8.8.tar.gz) = 2547868 diff -crN bricolage.orig/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh *** bricolage.orig/files/bric_upgrade.sh Sat May 7 16:16:08 2005 --- bricolage/files/bric_upgrade.sh Sun Nov 27 15:10:08 2005 *************** *** 12,18 **** # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` ! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234]$/OKAY/"` if [ "${VTEST}" != "OKAY" ] then echo "The final argument should be the old version of the port, in the format." --- 12,18 ---- # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` ! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[0123467]$/OKAY/"` if [ "${VTEST}" != "OKAY" ] then echo "The final argument should be the old version of the port, in the format." diff -crN bricolage.orig/files/patch-inst::required.pl bricolage/files/patch-inst::required.pl *** bricolage.orig/files/patch-inst::required.pl Wed Jun 16 09:34:30 2004 --- bricolage/files/patch-inst::required.pl Sun Nov 27 14:39:22 2005 *************** *** 1,44 **** ! --- inst/required.pl.orig Sat May 22 14:08:58 2004 ! +++ inst/required.pl Sat May 22 14:28:35 2004 ! @@ -67,6 +67,10 @@ ! our %REQ; ! our %RESULTS; ! ! +# check to see whether we should ask questions or not ! +our $QUIET; ! +$QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET'; ! + ! # collect data - configuration requirements data goes into %REQ, raw ! # binary pass/fail goes into %RESULTS. ! ! @@ -125,12 +129,12 @@ ! # confirm or deny ! if ($REQ{PG_CONFIG}) { ! print "Found PostgreSQL's pg_config at '$REQ{PG_CONFIG}'.\n"; ! - unless (ask_yesno("Is this correct? [yes] ", 1)) { ! + unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! } ! } else { ! print "Failed to find pg_config.\n"; ! - if (ask_yesno("Do you want to provide a path to pg_config? [no] ", ! + if (!$QUIET and ask_yesno("Do you want to provide a path to pg_config? [no] ", ! 0)) { ! $REQ{PG_CONFIG} = 'NONE'; ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! @@ -192,13 +196,13 @@ ! # confirm or deny ! if ($REQ{APACHE_EXE}) { ! print "Found Apache server binary at '$REQ{APACHE_EXE}'.\n"; ! - unless (ask_yesno("Is this correct? [yes] ", 1)) { ! + unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to Apache server binary", ! \$REQ{APACHE_EXE}); ! } ! } else { ! print "Failed to find Apache server binary.\n"; ! - if (ask_yesno("Do you want to provide a path to the Apache server " . ! + if (!$QUIET and ask_yesno("Do you want to provide a path to the Apache server " . ! "binary? [no] ", ! 0)) { ! $REQ{APACHE_EXE} = 'NONE'; --- 1,71 ---- ! *** inst/required.pl.orig Wed Aug 31 17:11:11 2005 ! --- inst/required.pl Sun Nov 27 14:38:37 2005 ! *************** ! *** 67,72 **** ! --- 67,76 ---- ! our %REQ; ! our %RESULTS; ! ! + # check to see whether we should ask questions or not ! + our $QUIET; ! + $QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET'; ! + ! # collect data - configuration requirements data goes into %REQ, raw ! # binary pass/fail goes into %RESULTS. ! ! *************** ! *** 125,136 **** ! # confirm or deny ! if ($REQ{PG_CONFIG}) { ! print "Found PostgreSQL's pg_config at '$REQ{PG_CONFIG}'.\n"; ! ! unless (ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! } ! } else { ! print "Failed to find pg_config.\n"; ! ! if (ask_yesno("Do you want to provide a path to pg_config? [no] ", ! 0)) { ! $REQ{PG_CONFIG} = 'NONE'; ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! --- 129,140 ---- ! # confirm or deny ! if ($REQ{PG_CONFIG}) { ! print "Found PostgreSQL's pg_config at '$REQ{PG_CONFIG}'.\n"; ! ! unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! } ! } else { ! print "Failed to find pg_config.\n"; ! ! if (!$QUIET and ask_yesno("Do you want to provide a path to pg_config? [no] ", ! 0)) { ! $REQ{PG_CONFIG} = 'NONE'; ! ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG}); ! *************** ! *** 188,200 **** ! # confirm or deny ! if ($REQ{APACHE_EXE}) { ! print "Found Apache server binary at '$REQ{APACHE_EXE}'.\n"; ! ! unless (ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to Apache server binary", ! \$REQ{APACHE_EXE}); ! } ! } else { ! print "Failed to find Apache server binary.\n"; ! ! if (ask_yesno("Do you want to provide a path to the Apache server " . ! "binary? [no] ", ! 0)) { ! $REQ{APACHE_EXE} = 'NONE'; ! --- 192,204 ---- ! # confirm or deny ! if ($REQ{APACHE_EXE}) { ! print "Found Apache server binary at '$REQ{APACHE_EXE}'.\n"; ! ! unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) { ! ask_confirm("Enter path to Apache server binary", ! \$REQ{APACHE_EXE}); ! } ! } else { ! print "Failed to find Apache server binary.\n"; ! ! if (!$QUIET and ask_yesno("Do you want to provide a path to the Apache server " . ! "binary? [no] ", ! 0)) { ! $REQ{APACHE_EXE} = 'NONE'; diff -crN bricolage.orig/pkg-plist bricolage/pkg-plist *** bricolage.orig/pkg-plist Thu Sep 15 23:06:58 2005 --- bricolage/pkg-plist Sun Nov 27 14:48:25 2005 *************** *** 37,42 **** --- 37,49 ---- bricolage/upgrade/1.8.6/fix_published_version.pl bricolage/upgrade/1.8.6/fix_resource_idx.pl bricolage/upgrade/1.8.6/fix_story_category_seq.pl + bricolage/upgrade/1.8.7/add_expire_event_types.pl + bricolage/upgrade/1.8.7/job_partial_index.pl + bricolage/upgrade/1.8.7/move_media.pl + bricolage/upgrade/1.8.7/move_media2.pl + bricolage/upgrade/1.8.7/postgresql_8.1_fixes.pl + bricolage/upgrade/1.8.8/fix_media_expire.pl + bricolage/upgrade/1.8.8/fix_media_resources.pl bricolage/comp/admin/alerts/dhandler bricolage/comp/admin/alerts/recip bricolage/comp/admin/control/change_user/dhandler *************** *** 2953,2958 **** --- 2960,2967 ---- @dirrm %%SITE_PERL%%/Bric @dirrm %%SITE_PERL%%/mach/auto/Bric @dirrm %%SITE_PERL%%/mach/auto/bric_bin + @dirrm bricolage/upgrade/1.8.8 + @dirrm bricolage/upgrade/1.8.7 @dirrm bricolage/upgrade/1.8.6 @dirrm bricolage/upgrade/1.8.4 @dirrm bricolage/upgrade/1.8.3 --- bricolage.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: