Date: Sat, 6 Aug 2005 00:11:09 -0400 (EDT) From: Rod Taylor <ports@rbt.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/84605: Maintainer-Update of www/bricolage Message-ID: <200508060411.j764B9dB078539@home.rbt.ca> Resent-Message-ID: <200508060420.j764KImu068521@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84605 >Category: ports >Synopsis: Maintainer-Update of www/bricolage >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: Sat Aug 06 04:20:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rod Taylor >Release: FreeBSD 5.3-RELEASE amd64 >Organization: >Environment: System: FreeBSD home 5.3-RELEASE FreeBSD 5.3-RELEASE #8: Thu May 12 00:34:34 EDT 2005 root@home:/usr/obj/usr/src/sys/HOME amd64 >Description: Upgrade Bricolage from 1.8.5 to 1.8.6 which includes plenty of bug fixes. New dependency on devel/p5-Term-ReadPassword (ports/84604) >How-To-Repeat: >Fix: --- bric_1.8.6.patch begins here --- diff -crN bricolage.orig/Makefile bricolage/Makefile *** bricolage.orig/Makefile Thu May 5 05:14:20 2005 --- bricolage/Makefile Fri Aug 5 23:14:30 2005 *************** *** 6,12 **** # PORTNAME= bricolage ! PORTVERSION= 1.8.5 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bricolage --- 6,12 ---- # PORTNAME= bricolage ! PORTVERSION= 1.8.6 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bricolage *************** *** 23,28 **** --- 23,29 ---- ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \ ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \ + ${SITE_PERL}/Term/ReadPassword.pm:${PORTSDIR}/devel/p5-Term-ReadPassword \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \ ${SITE_PERL}/Test/Class.pm:${PORTSDIR}/devel/p5-Test-Class \ *************** *** 51,58 **** MAKE_ENV+= INSTALL_VERBOSITY="QUIET" ! # Used to determine which versions we can upgrade from ! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 # Skip ${PORTVERSION} for 1.8.5 USE_REINPLACE= yes PERL_CONFIGURE= yes --- 52,63 ---- MAKE_ENV+= INSTALL_VERBOSITY="QUIET" ! # Used to determine which versions have perl scripts ! # that need to run for an upgrade. These should be listed ! # 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 diff -crN bricolage.orig/distinfo bricolage/distinfo *** bricolage.orig/distinfo Thu May 5 00:10:54 2005 --- bricolage/distinfo Fri Aug 5 22:32:22 2005 *************** *** 1,2 **** ! MD5 (bricolage-1.8.5.tar.gz) = b226db1637a596cd53dec6784fd3d070 ! SIZE (bricolage-1.8.5.tar.gz) = 2533538 --- 1,2 ---- ! MD5 (bricolage-1.8.6.tar.gz) = 31471d279b8dc68b7ddc8f8282924f75 ! SIZE (bricolage-1.8.6.tar.gz) = 2543150 diff -crN bricolage.orig/files/patch-inst::postgres.pl bricolage/files/patch-inst::postgres.pl *** bricolage.orig/files/patch-inst::postgres.pl Wed Jun 16 09:34:30 2004 --- bricolage/files/patch-inst::postgres.pl Fri Aug 5 22:53:24 2005 *************** *** 1,57 **** ! --- inst/postgres.pl.orig Thu Feb 19 08:37:08 2004 ! +++ inst/postgres.pl Sun May 23 11:58:05 2004 ! @@ -36,15 +36,19 @@ ! use File::Spec::Functions; ! use Data::Dumper; ! ! +# check whether questions should be asked ! +our $QUIET; ! +$QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET'; ! + ! print "\n\n==> Probing PostgreSQL Configuration <==\n\n"; ! ! our %PG; ! ! # setup some defaults ! -$PG{root_user} = 'postgres'; ! +$PG{root_user} = 'pgsql'; ! $PG{root_pass} = ''; ! $PG{sys_user} = 'bric'; ! -$PG{sys_pass} = 'NONE'; ! +$PG{sys_pass} = ''; # Ask the user to deal with it ! $PG{db_name} = 'bric'; ! $PG{host_name} = ''; ! $PG{host_port} = ''; ! @@ -58,8 +62,9 @@ ! get_bin_dir(); ! get_psql(); ! get_version(); ! -get_users(); ! -get_host(); ! +# Skip for automated installation ! +#get_users(); ! +#get_host(); ! get_version(); ! ! # all done, dump out apache database, announce success and exit ! @@ -122,13 +127,18 @@ ! # ask the user for user settings ! sub get_users { ! print "\n"; ! - ask_confirm("Postgres Root Username", \$PG{root_user}); ! + if ($QUIET) { ! + print "Postgres Root Username ". $PG{root_user} ."\n"; ! + } ! + else { ! + ask_confirm("Postgres Root Username", \$PG{root_user}); ! + } ! ask_confirm("Postgres Root Password (leave empty for no password)", ! \$PG{root_pass}); ! ! while(1) { ! $PG{system_user} = $PG{root_user}; ! - ask_confirm("Postgres System Username", \$PG{system_user}); ! + ask_confirm("Postgres System Username", \$PG{system_user}) unless $QUIET; ! $PG{system_user_uid} = (getpwnam($PG{system_user}))[2]; ! last if defined $PG{system_user_uid}; ! print "User \"$PG{system_user}\" not found! This user must exist ". --- 1,93 ---- ! *** inst/postgres.pl.orig Thu Jul 14 00:03:08 2005 ! --- inst/postgres.pl Fri Aug 5 22:52:39 2005 ! *************** ! *** 36,50 **** ! use File::Spec::Functions; ! use Data::Dumper; ! ! print "\n\n==> Probing PostgreSQL Configuration <==\n\n"; ! ! our %PG; ! ! # setup some defaults ! ! $PG{root_user} = 'postgres'; ! $PG{root_pass} = ''; ! $PG{sys_user} = 'bric'; ! ! $PG{sys_pass} = 'NONE'; ! $PG{db_name} = 'bric'; ! $PG{host_name} = ''; ! $PG{host_port} = ''; ! --- 36,54 ---- ! use File::Spec::Functions; ! use Data::Dumper; ! ! + # check whether questions should be asked ! + our $QUIET; ! + $QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET'; ! + ! print "\n\n==> Probing PostgreSQL Configuration <==\n\n"; ! ! our %PG; ! ! # setup some defaults ! ! $PG{root_user} = 'pgsql'; ! $PG{root_pass} = ''; ! $PG{sys_user} = 'bric'; ! ! $PG{sys_pass} = ''; # Ask the user to deal with it ! $PG{db_name} = 'bric'; ! $PG{host_name} = ''; ! $PG{host_port} = ''; ! *************** ! *** 58,65 **** ! get_bin_dir(); ! get_psql(); ! get_version(); ! ! get_users(); ! ! get_host(); ! get_version(); ! ! # all done, dump out apache database, announce success and exit ! --- 62,70 ---- ! get_bin_dir(); ! get_psql(); ! get_version(); ! ! # Skip for automated installation ! ! #get_users(); ! ! #get_host(); ! get_version(); ! ! # all done, dump out apache database, announce success and exit ! *************** ! *** 122,134 **** ! # ask the user for user settings ! sub get_users { ! print "\n"; ! ! ask_confirm("Postgres Root Username", \$PG{root_user}); ! ask_password("Postgres Root Password (leave empty for no password)", ! \$PG{root_pass}); ! ! while(1) { ! $PG{system_user} = $PG{root_user}; ! ! ask_confirm("Postgres System Username", \$PG{system_user}); ! $PG{system_user_uid} = (getpwnam($PG{system_user}))[2]; ! last if defined $PG{system_user_uid}; ! print "User \"$PG{system_user}\" not found! This user must exist ". ! --- 127,144 ---- ! # ask the user for user settings ! sub get_users { ! print "\n"; ! ! if ($QUIET) { ! ! print "Postgres Root Username ". $PG{root_user} ."\n"; ! ! } ! ! else { ! ! ask_confirm("Postgres Root Username", \$PG{root_user}); ! ! } ! ask_password("Postgres Root Password (leave empty for no password)", ! \$PG{root_pass}); ! ! while(1) { ! $PG{system_user} = $PG{root_user}; ! ! ask_confirm("Postgres System Username", \$PG{system_user}) unless $QUIET; ! $PG{system_user_uid} = (getpwnam($PG{system_user}))[2]; ! last if defined $PG{system_user_uid}; ! print "User \"$PG{system_user}\" not found! This user must exist ". diff -crN bricolage.orig/pkg-plist bricolage/pkg-plist *** bricolage.orig/pkg-plist Thu May 5 00:11:08 2005 --- bricolage/pkg-plist Fri Aug 5 22:35:40 2005 *************** *** 33,38 **** --- 33,42 ---- bricolage/upgrade/1.8.3/story_uri_pk.pl bricolage/upgrade/1.8.3/worfkow_type_ck.pl bricolage/upgrade/1.8.4/replace_action_media_types.pl + bricolage/upgrade/1.8.6/fix_autopopulateds.pl + 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/comp/admin/alerts/dhandler bricolage/comp/admin/alerts/recip bricolage/comp/admin/control/change_user/dhandler *************** *** 2948,2953 **** --- 2952,2958 ---- @dirrm %%SITE_PERL%%/Bric @dirrm %%SITE_PERL%%/mach/auto/Bric @dirrm %%SITE_PERL%%/mach/auto/bric_bin + @dirrm bricolage/upgrade/1.8.6 @dirrm bricolage/upgrade/1.8.4 @dirrm bricolage/upgrade/1.8.3 @dirrm bricolage/upgrade/1.8.2 --- bric_1.8.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508060411.j764B9dB078539>