4 files changed, 23 insertions, 20 deletions

diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index 87623d5ad017..c62a6b62b0fd 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.5
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -26,6 +26,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p
 		${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 \
+		${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
 		${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
@@ -51,7 +52,7 @@ 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 ${PORTVERSION}
+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
diff --git a/www/bricolage/distinfo b/www/bricolage/distinfo
index b1701fd05bd6..242ba42ea582 100644
--- a/www/bricolage/distinfo
+++ b/www/bricolage/distinfo
@@ -1,2 +1,2 @@
-MD5 (bricolage-1.8.3.tar.gz) = 20a2fbec28f9595a26224c307b2786f9
-SIZE (bricolage-1.8.3.tar.gz) = 2517168
+MD5 (bricolage-1.8.5.tar.gz) = b226db1637a596cd53dec6784fd3d070
+SIZE (bricolage-1.8.5.tar.gz) = 2533538
diff --git a/www/bricolage/files/patch-inst::config.pl b/www/bricolage/files/patch-inst::config.pl
index 7a65ea8b39d5..66ad53f8c2d6 100644
--- a/www/bricolage/files/patch-inst::config.pl
+++ b/www/bricolage/files/patch-inst::config.pl
@@ -1,5 +1,5 @@
-*** inst/config.pl.orig	Fri Jul 25 00:39:23 2003
---- inst/config.pl	Tue Jun  1 22:23:26 2004
+*** inst/config.pl.orig	Fri Mar 18 17:12:51 2005
+--- inst/config.pl	Tue May  3 18:40:57 2005
 ***************
 *** 36,41 ****
 --- 36,45 ----
@@ -14,12 +14,12 @@
   our %CONFIG;
   
 ***************
-*** 71,92 ****
+*** 73,94 ****
   
   END
   
-!     $CONFIG{set} = ask_choice("Your choice?", 
-!                               [ "s", "m" ], "s");
+!     $CONFIG{set} = ask_choice("Your choice?",
+!                               [ "s", "m" ], "m");
   
       # setup the default
       if ($CONFIG{set} eq 's') {
@@ -32,12 +32,12 @@
           $CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
           $CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
   
-!         # remove man3 trailer
+          # remove man3 trailer
 !         $CONFIG{MAN_DIR} =~ s!/man3!!;
   
           # construct default system-wide log directory based on Apache
           # error_log setting
---- 75,99 ----
+--- 77,101 ----
   
   END
   
@@ -52,19 +52,19 @@
           $CONFIG{TEMP_DIR}        = tmpdir();
 !         $CONFIG{MODULE_DIR}      = '/usr/local/lib/perl5/site_perl/5.8.2/ '; #$Config{sitelib};
 !         $CONFIG{BIN_DIR}         = '/usr/local/bin'; #$Config{scriptdir};
-!         $CONFIG{MAN1_DIR}         = '/usr/local/man/man1'; #$Config{man3dir};
-!         $CONFIG{MAN3_DIR}         = '/usr/local/lib/perl5/5.8.2/man/man3'; #$Config{man1dir};
+!         $CONFIG{MAN1_DIR}         = '/usr/local/man/man1'; #$Config{man1dir};
+!         $CONFIG{MAN3_DIR}         = '/usr/local/lib/perl5/5.8.2/man/man3'; #$Config{man3dir};
           $CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
           $CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
   
-!         # remove manN trailer
+          # remove man3 trailer
 !         $CONFIG{MAN1_DIR} =~ s!/man1!!;
 !         $CONFIG{MAN3_DIR} =~ s!/man3!!;
   
           # construct default system-wide log directory based on Apache
           # error_log setting
 ***************
-*** 113,119 ****
+*** 115,121 ****
           $CONFIG{TEMP_DIR}         = '$CONFIG{BRICOLAGE_ROOT}/tmp';
           $CONFIG{MODULE_DIR}       = '$CONFIG{BRICOLAGE_ROOT}/lib';
           $CONFIG{BIN_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/bin';
@@ -72,7 +72,7 @@
           $CONFIG{LOG_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/log';
           $CONFIG{PID_FILE}         = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
           $CONFIG{MASON_COMP_ROOT}  = '$CONFIG{BRICOLAGE_ROOT}/comp';
---- 120,127 ----
+--- 122,129 ----
           $CONFIG{TEMP_DIR}         = '$CONFIG{BRICOLAGE_ROOT}/tmp';
           $CONFIG{MODULE_DIR}       = '$CONFIG{BRICOLAGE_ROOT}/lib';
           $CONFIG{BIN_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/bin';
@@ -82,7 +82,7 @@
           $CONFIG{PID_FILE}         = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
           $CONFIG{MASON_COMP_ROOT}  = '$CONFIG{BRICOLAGE_ROOT}/comp';
 ***************
-*** 123,129 ****
+*** 125,131 ****
   
   sub confirm_settings {
     my $default_root = $CONFIG{BRICOLAGE_ROOT};
@@ -90,7 +90,7 @@
   
     # make sure this directory isn't the same at the source directory
     if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
---- 131,142 ----
+--- 133,144 ----
   
   sub confirm_settings {
     my $default_root = $CONFIG{BRICOLAGE_ROOT};
@@ -104,7 +104,7 @@
     # make sure this directory isn't the same at the source directory
     if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
 ***************
-*** 140,163 ****
+*** 142,165 ****
         -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
         print "That directory already contains a Bricolage installation.\n";
         print "Consider running `make upgrade`, instead.\n";
@@ -129,7 +129,7 @@
 -   ask_confirm("Mason Component Directory", \$CONFIG{MASON_COMP_ROOT});
 -   ask_confirm("Mason Data Directory",      \$CONFIG{MASON_DATA_ROOT});
   }
---- 153,190 ----
+--- 155,192 ----
         -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
         print "That directory already contains a Bricolage installation.\n";
         print "Consider running `make upgrade`, instead.\n";
diff --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index 08d735ea4b97..c18ba7a00347 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -32,6 +32,7 @@ bricolage/upgrade/1.8.3/fix_event_sequence.pl
 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/comp/admin/alerts/dhandler
 bricolage/comp/admin/alerts/recip
 bricolage/comp/admin/control/change_user/dhandler
@@ -2947,6 +2948,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.4
 @dirrm bricolage/upgrade/1.8.3
 @dirrm bricolage/upgrade/1.8.2
 @dirrm bricolage/upgrade/1.8.1