- Update to 1.8.8.

- Add SHA256 checksum.

PR:		ports/89649
Submitted by:	maintainer

5 files changed, 86 insertions, 50 deletions

diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index a5f788df48fa..0e99237bd80e 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.8.6
+PORTVERSION=	1.8.8
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -44,7 +44,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p
 		${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}
 
@@ -57,7 +56,7 @@ MAKE_ENV+=	INSTALL_VERBOSITY="QUIET"
 # 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
+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 --git a/www/bricolage/distinfo b/www/bricolage/distinfo
index 99a2d7dc6c45..3ce2b1f28e5a 100644
--- a/www/bricolage/distinfo
+++ b/www/bricolage/distinfo
@@ -1,2 +1,3 @@
-MD5 (bricolage-1.8.6.tar.gz) = 31471d279b8dc68b7ddc8f8282924f75
-SIZE (bricolage-1.8.6.tar.gz) = 2543150
+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 --git a/www/bricolage/files/bric_upgrade.sh b/www/bricolage/files/bric_upgrade.sh
index fb5380cb355e..f6323c74ab55 100644
--- a/www/bricolage/files/bric_upgrade.sh
+++ b/www/bricolage/files/bric_upgrade.sh
@@ -12,7 +12,7 @@ fi
 
 # 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/"`
+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 --git a/www/bricolage/files/patch-inst::required.pl b/www/bricolage/files/patch-inst::required.pl
index eb1ca8e6f2b5..1c61c915c31b 100644
--- a/www/bricolage/files/patch-inst::required.pl
+++ b/www/bricolage/files/patch-inst::required.pl
@@ -1,44 +1,71 @@
---- 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';
+*** 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 --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index e7a0c06db298..9b379d469bd5 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -37,6 +37,13 @@ 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/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,6 +2960,8 @@ 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.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