Add two patches missed in the last update:

Update to 1.10.0.

PR:		ports/92822
Submitted by:	Rod Taylor <ports@rbt.ca> (maintainer)

2 files changed, 84 insertions, 0 deletions

diff --git a/www/bricolage/files/patch-inst_db_upgrade.pl b/www/bricolage/files/patch-inst_db_upgrade.pl
new file mode 100644
index 00000000000..dd38200c575
--- /dev/null
+++ b/www/bricolage/files/patch-inst_db_upgrade.pl
@@ -0,0 +1,19 @@
+*** inst/db_upgrade.pl.orig	Fri Sep 16 19:50:20 2005
+--- inst/db_upgrade.pl	Fri Feb  3 19:47:06 2006
+***************
+*** 73,79 ****
+      next unless -d $dir;
+  
+      opendir(DIR, $dir) or die "can't opendir $dir: $!";
+!     my @scripts = grep { -f $_ } map { catfile($dir, $_) } sort readdir(DIR);
+      closedir DIR;
+  
+      foreach my $script (@scripts) {
+--- 73,79 ----
+      next unless -d $dir;
+  
+      opendir(DIR, $dir) or die "can't opendir $dir: $!";
+!     my @scripts = grep { -f $_ and $_ =~ /\.pl$/ } map { catfile($dir, $_) } sort readdir(DIR);
+      closedir DIR;
+  
+      foreach my $script (@scripts) {
diff --git a/www/bricolage/files/patch-inst_defaults_freebsd b/www/bricolage/files/patch-inst_defaults_freebsd
new file mode 100644
index 00000000000..09c8b01ca96
--- /dev/null
+++ b/www/bricolage/files/patch-inst_defaults_freebsd
@@ -0,0 +1,65 @@
+*** inst/defaults/freebsd.orig	Sat Jan 28 14:09:16 2006
+--- inst/defaults/freebsd	Sat Jan 28 14:06:59 2006
+***************
+*** 0 ****
+--- 1,60 ----
++ # Required programs.  PG_CONFIG_PATH is the location of PostgreSQL's pg_config 
++ # script.  APACHE_PATH is the path to the Apache 1.3 executable.  APACHE_EXE is
++ # the filename of the executable itself.  EXPAT_PATH is the path to the Expat 
++ # library libexpat.so (also looks in library paths that Perl knows about), and
++ # EXPAT_FILE is the filename of the library.
++ 
++ PG_CONFIG_PATH = /usr/local/pgsql/bin, /usr/local/postgres/bin, /usr/lib/postgresql/bin, /opt/pgsql/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
++ APACHE_PATH = /usr/local/apache/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
++ APACHE_EXE  = httpd, httpsd, apache-perl, apache
++ EXPAT_PATH  = /sw/lib
++ EXPAT_FILE  = libexpat.so, libexpat.so.0, libexpat.so.0.0.1, libexpat.dylib, libexpat.0.dylib, libexpat.0.0.1.dylib, libexpat.a, libexpat.la
++ 
++ # Apache settings.  APACHE_USER and APACHE_GROUP are the user and group that
++ # the Apache process will run as.  APACHE_PORT is the port that Apache will
++ # listen on.  APACHE_SSL_PORT is the port that will listen for https requests.
++ # APACHE_HOSTNAME is the server's hostname; only set this if you want to 
++ # override the value returned by the "hostname" command.
++ 
++ APACHE_USER     = www
++ APACHE_GROUP    = www
++ APACHE_PORT     = 80
++ APACHE_SSL_PORT = 443
++ # APACHE_HOSTNAME = localhost
++ 
++ # PostgreSQL settings.  POSTGRES_SUPERUSER is the username of the Postgres
++ # superuser (typically "postgres").  POSTGRES_BRICUSER is the username that 
++ # Bricolage will use when connecting to the database.  This can be anything 
++ # you want, but "bric" is typical. POSTGRES_DB is the name of the database 
++ # Bricolage will use.
++ #
++ # In most installations, Postgres allows local users to access the
++ # server without a username.  If your server requires a password, pass the
++ # POSTGRES_SUPERPASS environment variable during "make," e.g.:
++ #
++ #    make POSTGRES_SUPERPASS=abcdef
++ #
++ # The Bricolage Postgres Password (the password used by Bricolage to
++ # connect to the database) is randomly generated during a silent install.  If
++ # you need it, it'll be in bricolage.conf after installation.
++ #
++ # If PostgreSQL is running on a separate box, you must pass a host name or 
++ # IP address to "make" through the POSTGRES_HOSTNAME environment variable.
++ # If it's running on a port other than the default port (5432), pass the 
++ # appropriate port number with POSTGRES_HOSTPORT.
++ 
++ POSTGRES_SUPERUSER   = pgsql
++ POSTGRES_BRICUSER     = bric
++ POSTGRES_DB          = bric
++ 
++ # Installation locations.
++ 
++ BRICOLAGE_ROOT_DIR = /usr/local/bricolage       # Bricolage Root Directory
++ BRICOLAGE_TMP_DIR  = /usr/local/bricolage/tmp   # Temporary Directory
++ BRICOLAGE_PERL_DIR = /usr/local/bricolage/lib   # Perl Module Directory
++ BRICOLAGE_BIN_DIR  = /usr/local/bricolage/bin   # Executable Directory
++ BRICOLAGE_MAN_DIR  = /usr/local/bricolage/man   # Man-Page Directory (! to skip)
++ BRICOLAGE_LOG_DIR  = /usr/local/bricolage/log   # Log Directory
++ BRICOLAGE_PID      = /usr/local/bricolage/log/httpd.pid  # PID File Location
++ BRICOLAGE_COMP_DIR = /usr/local/bricolage/comp  # Mason Component Directory
++ BRICOLAGE_DATA_DIR = /usr/local/bricolage/data  # Mason Data Directory