4 files changed, 109 insertions, 62 deletions

diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index c62a6b62b0fd..b7b5f8be4b0c 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.8.5
+PORTVERSION=	1.8.6
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -23,6 +23,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p
 		${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,8 +52,12 @@ APXS?=		${LOCALBASE}/sbin/apxs
 
 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
+# 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 --git a/www/bricolage/distinfo b/www/bricolage/distinfo
index 242ba42ea582..99a2d7dc6c45 100644
--- a/www/bricolage/distinfo
+++ b/www/bricolage/distinfo
@@ -1,2 +1,2 @@
-MD5 (bricolage-1.8.5.tar.gz) = b226db1637a596cd53dec6784fd3d070
-SIZE (bricolage-1.8.5.tar.gz) = 2533538
+MD5 (bricolage-1.8.6.tar.gz) = 31471d279b8dc68b7ddc8f8282924f75
+SIZE (bricolage-1.8.6.tar.gz) = 2543150
diff --git a/www/bricolage/files/patch-inst::postgres.pl b/www/bricolage/files/patch-inst::postgres.pl
index d104521caeb0..7f496243746a 100644
--- a/www/bricolage/files/patch-inst::postgres.pl
+++ b/www/bricolage/files/patch-inst::postgres.pl
@@ -1,57 +1,93 @@
---- 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 ".
+*** 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 --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index c18ba7a00347..e7a0c06db298 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -33,6 +33,10 @@ bricolage/upgrade/1.8.3/media_uri_pk.pl
 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
@@ -2594,6 +2598,7 @@ bricolage/comp/workflow/profile/media/container/edit.html
 bricolage/comp/workflow/profile/media/container/edit_bulk.html
 bricolage/comp/workflow/profile/media/container/edit_related_media.html
 bricolage/comp/workflow/profile/media/container/edit_related_story.html
+bricolage/comp/workflow/profile/media/container/edit_super_bulk.html
 bricolage/comp/workflow/profile/media/contributor_role.html
 bricolage/comp/workflow/profile/media/contributors.html
 bricolage/comp/workflow/profile/media/dhandler
@@ -2948,6 +2953,7 @@ share/bricolage/Pg.sql
 @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