16 files changed, 43 insertions, 313 deletions

diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index 56e2120a8ab7..7a28718500d9 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.10.0
+PORTVERSION=	1.10.1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -64,12 +64,13 @@ MAKE_ENV+=	USE_DEFAULTS=freebsd
 # 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 1.8.7 1.8.8 1.8.9 1.9.0 1.9.1 1.10.0
+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 1.8.9 1.9.0 1.9.1 1.10.0 1.10.1
 
-USE_REINPLACE=	yes
 PERL_CONFIGURE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+INSTALL_TARGET=	install_files
+
 .include <bsd.port.pre.mk>
 
 # Needs perl 5.8.x or later for decent unicode support
@@ -167,10 +168,11 @@ MAN3=		Bric.3 Bric::Admin.3 Bric::AdvTemplates.3 Bric::Alert.3 \
 		Bric::Dist::Resource.3 Bric::Dist::Server.3 Bric::Dist::ServerType.3 \
 		Bric::ElementAdmin.3 Bric::FAQ.3 Bric::HTMLTemplate.3 Bric::Hacker.3 \
 		Bric::License.3 Bric::SOAP.3 Bric::SOAP::Asset.3 Bric::SOAP::Auth.3 \
-		Bric::SOAP::ATType.3 Bric::SOAP::Category.3 Bric::SOAP::Desk.3 \
+		Bric::SOAP::ATType.3 Bric::SOAP::Category.3 Bric::SOAP::ContribType.3 \
+		Bric::SOAP::Destination.3 Bric::SOAP::Desk.3 \
 		Bric::SOAP::ElementType.3 Bric::SOAP::Handler.3 Bric::SOAP::Keyword.3 \
 		Bric::SOAP::Media.3 Bric::SOAP::MediaType.3 Bric::SOAP::OutputChannel.3 \
-		Bric::SOAP::Site.3 Bric::SOAP::Story.3 Bric::SOAP::Template.3 \
+		Bric::SOAP::Preference.3 Bric::SOAP::Site.3 Bric::SOAP::Story.3 Bric::SOAP::Template.3 \
 		Bric::SOAP::User.3 Bric::SOAP::Util.3 Bric::SOAP::Workflow.3 \
 		Bric::Security.3 Bric::Templates.3 Bric::ToDo.3 \
 		Bric::Util::Alert.3 Bric::Util::AlertType.3 \
diff --git a/www/bricolage/distinfo b/www/bricolage/distinfo
index ad0904f2be87..c7904fa141eb 100644
--- a/www/bricolage/distinfo
+++ b/www/bricolage/distinfo
@@ -1,3 +1,3 @@
-MD5 (bricolage-1.10.0.tar.gz) = 5bbdc7906d00e74e444c17c6113500ea
-SHA256 (bricolage-1.10.0.tar.gz) = 6e1e42a0c868047b75a87cb907fae04a3dee310f6d355b4540f98a2449c96862
-SIZE (bricolage-1.10.0.tar.gz) = 2678377
+MD5 (bricolage-1.10.1.tar.gz) = 530150a73a2b42f4e635400099d97913
+SHA256 (bricolage-1.10.1.tar.gz) = c9947a8b033b217b7ff181471cc0345d035543e1b8c1ddfc8572ba95ded3ba0b
+SIZE (bricolage-1.10.1.tar.gz) = 2697406
diff --git a/www/bricolage/files/bric_upgrade.sh b/www/bricolage/files/bric_upgrade.sh
index 23b8586d9033..e6c9cef3b3ac 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\.[01234678]$/OKAY/"`
+VTEST=`echo "$OLDVERSION" | sed -e 's/^1\.8\.[01234678]$/OKAY/' -e 's/^1\.10\.[0]$/OKAY/'`
 if [ "${VTEST}" != "OKAY" ]
 then
 	echo "Version $OLDVERSION unknown."
diff --git a/www/bricolage/files/patch-Makefile b/www/bricolage/files/patch-Makefile
index fcf12fcf370f..bd2e3dbec790 100644
--- a/www/bricolage/files/patch-Makefile
+++ b/www/bricolage/files/patch-Makefile
@@ -1,7 +1,7 @@
-*** Makefile.orig	Tue Jan 17 19:09:49 2006
---- Makefile	Tue Jan 31 23:12:14 2006
+*** Makefile.orig	Fri Mar 17 19:26:34 2006
+--- Makefile	Fri Mar 31 18:35:33 2006
 ***************
-*** 18,24 ****
+*** 19,25 ****
   #
   
   # Set the location of Perl.
@@ -9,7 +9,7 @@
   
   # Blank by default, but set to QUIET to ask essential questions only
   INSTALL_VERBOSITY?= STANDARD
---- 18,24 ----
+--- 19,25 ----
   #
   
   # Set the location of Perl.
@@ -18,24 +18,7 @@
   # Blank by default, but set to QUIET to ask essential questions only
   INSTALL_VERBOSITY?= STANDARD
 ***************
-*** 161,167 ****
-  # installation rules     #
-  ##########################
-  
-! install 	: all is_root cpan lib bin files db db_grant done
-  
-  is_root         : inst/is_root.pl
-  	$(PERL) inst/is_root.pl
---- 161,167 ----
-  # installation rules     #
-  ##########################
-  
-! install 	: all is_root cpan lib bin files done
-  
-  is_root         : inst/is_root.pl
-  	$(PERL) inst/is_root.pl
-***************
-*** 171,190 ****
+*** 184,203 ****
   
   lib 		: 
   	-rm -f lib/Makefile
@@ -56,7 +39,7 @@
   
   done		: bconf/bricolage.conf db files bin lib cpan
   	$(PERL) inst/done.pl
---- 171,190 ----
+--- 184,203 ----
   
   lib 		: 
   	-rm -f lib/Makefile
diff --git a/www/bricolage/files/patch-inst_db_upgrade.pl b/www/bricolage/files/patch-inst_db_upgrade.pl
deleted file mode 100644
index dd38200c575b..000000000000
--- a/www/bricolage/files/patch-inst_db_upgrade.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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
deleted file mode 100644
index 09c8b01ca968..000000000000
--- a/www/bricolage/files/patch-inst_defaults_freebsd
+++ /dev/null
@@ -1,65 +0,0 @@
-*** 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
diff --git a/www/bricolage/files/patch-inst_postgres.pl b/www/bricolage/files/patch-inst_postgres.pl
index 293f2f079138..a8ec60e6801f 100644
--- a/www/bricolage/files/patch-inst_postgres.pl
+++ b/www/bricolage/files/patch-inst_postgres.pl
@@ -1,17 +1,19 @@
---- inst/postgres.pl.orig	Sun Feb 12 12:39:15 2006
-+++ inst/postgres.pl	Sun Feb 12 12:39:32 2006
-@@ -133,14 +133,9 @@
-     ask_password("Postgres Root Password (leave empty for no password)",
- 		\$PG{root_pass}, $QUIET);
- 
--    while(1) {
- 	$PG{system_user} = $PG{root_user};
-         ask_confirm("Postgres System Username", \$PG{system_user}, $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 ".
--	    "on your system.\n";
--    }
- 
-     while(1) {
-       ask_confirm("Bricolage Postgres Username", \$PG{sys_user}, $QUIET);
+*** inst/postgres.pl.orig	Sun Apr  2 10:26:59 2006
+--- inst/postgres.pl	Sun Apr  2 10:27:55 2006
+***************
+*** 135,141 ****
+  
+      unless ($PG{host_name}) {
+          $PG{system_user} = $PG{root_user};
+!         while(1) {
+              ask_confirm("Postgres System Username", \$PG{system_user}, $QUIET);
+              $PG{system_user_uid} = (getpwnam($PG{system_user}))[2];
+              last if defined $PG{system_user_uid};
+--- 135,141 ----
+  
+      unless ($PG{host_name}) {
+          $PG{system_user} = $PG{root_user};
+!         while(!$QUIET) {
+              ask_confirm("Postgres System Username", \$PG{system_user}, $QUIET);
+              $PG{system_user_uid} = (getpwnam($PG{system_user}))[2];
+              last if defined $PG{system_user_uid};
diff --git a/www/bricolage/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl b/www/bricolage/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl
deleted file mode 100644
index f27897f12274..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- inst/upgrade/1.8.9/add_element_member_fks.pl.orig	Tue Nov  1 05:31:35 2005
-+++ inst/upgrade/1.8.9/add_element_member_fks.pl	Thu Feb  9 02:17:16 2006
-@@ -7,7 +7,7 @@ use lib catdir $FindBin::Bin, updir, 'li
- use bric_upgrade qw(:all);
- 
- exit unless test_table 'element_member';
--exit if test_constraint 'element_member', 'fk_member__at_member';
-+exit if test_foreign_key 'element_member', 'fk_member__at_member';
- 
- do_sql
-     q{ DELETE FROM element_member
diff --git a/www/bricolage/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl b/www/bricolage/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl
deleted file mode 100644
index c19fffee7f5e..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl
+++ /dev/null
@@ -1,41 +0,0 @@
---- inst/upgrade/1.8.9/fix_publish_status.pl.orig	Fri Jan 20 08:07:05 2006
-+++ inst/upgrade/1.8.9/fix_publish_status.pl	Thu Feb  9 02:17:16 2006
-@@ -6,12 +6,18 @@ use FindBin;
- use lib catdir $FindBin::Bin, updir, 'lib';
- use bric_upgrade qw(:all);
- 
-+# Later versions will have booleans instead of NUMERIC.
-+my ($true, $false)
-+    = test_column('story', 'publish_status', undef, undef, 'boolean')
-+    ? qw(TRUE FALSE)
-+    : qw( 1 0 );
-+
- for my $thing (qw(story media)) {
-     do_sql
-         qq{UPDATE $thing
--           SET    publish_status = '1'
-+           SET    publish_status = $true
-            WHERE  published_version IS NOT NULL
--                  AND publish_status = '0'
-+                  AND publish_status = $false
-         },
- 
-         # We have no idea what version was actually published, so
-@@ -19,7 +25,7 @@ for my $thing (qw(story media)) {
-         qq{UPDATE $thing
-            SET    published_version = current_version
-            WHERE  published_version IS NULL
--                  AND publish_status = '1'
-+                  AND publish_status = $true
-         },
- 
-         # We don't know if it has been published since the first
-@@ -39,7 +45,7 @@ for my $thing (qw(story media)) {
- 
-         # Remove the publish_status when there are no publish dates.
-         qq{UPDATE $thing
--           SET    publish_status = '0'
-+           SET    publish_status = $false
-            WHERE  publish_date IS NULL
-         },
-     ;
diff --git a/www/bricolage/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl b/www/bricolage/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl
deleted file mode 100644
index c4e6dfeb99c4..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl
+++ /dev/null
@@ -1,57 +0,0 @@
---- inst/upgrade/1.8.9/update_publish_status_check.pl.orig	Fri Jan 20 08:07:05 2006
-+++ inst/upgrade/1.8.9/update_publish_status_check.pl	Thu Feb  9 02:17:16 2006
-@@ -9,27 +9,46 @@ use bric_upgrade qw(:all);
- # Skip it for later versions of Bricolage.
- exit unless test_constraint 'story', 'ck_story__publish_status';
- 
-+# Later versions will have booleans instead of NUMERIC.
-+my $bool = test_column('story', 'publish_status', undef, undef, 'boolean');
-+
- for my $thing (qw(story media)) {
-     do_sql
-         qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
- 
--        qq{ALTER TABLE $thing
--           ADD CONSTRAINT ck_$thing\__publish_status CHECK (
--               publish_status IN (0,1)
--               AND (
-+        ($bool
-+         ?  qq{ALTER TABLE $thing
-+               ADD CONSTRAINT ck_$thing\__publish_status CHECK (
-                    (
--                       publish_status = 0
-+                       publish_status = FALSE
-                        AND publish_date IS NULL
-                        AND first_publish_date IS NULL
-                    )
-                    OR (
--                       publish_status = 1
-+                       publish_status = TRUE
-                        AND publish_date IS NOT NULL
-                        AND first_publish_date IS NOT NULL
-                    )
-                )
--           )
--        },
-+            }
-+         :  qq{ALTER TABLE $thing
-+               ADD CONSTRAINT ck_$thing\__publish_status CHECK (
-+                   publish_status IN (0, 1)
-+                   AND (
-+                       (
-+                           publish_status = 0
-+                           AND publish_date IS NULL
-+                           AND first_publish_date IS NULL
-+                       )
-+                       OR (
-+                           publish_status = 1
-+                           AND publish_date IS NOT NULL
-+                           AND first_publish_date IS NOT NULL
-+                       )
-+                   )
-+               )
-+            }
-+        )
-     ;
- }
- 
diff --git a/www/bricolage/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl b/www/bricolage/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl
deleted file mode 100644
index 95823e036556..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl
+++ /dev/null
@@ -1,15 +0,0 @@
---- inst/upgrade/1.9.0/no_more_numeric.pl.orig	Thu Aug 18 08:20:34 2005
-+++ inst/upgrade/1.9.0/no_more_numeric.pl	Thu Feb  9 02:17:16 2006
-@@ -101,6 +101,12 @@ while (<OLD>) {
-         $last =~ s/,$// if $_ =~ /^\);/;
-     }
- 
-+    # Fix incompatible checks.
-+    if (/ck_(?:story|media)__publish_status/) {
-+        s/\(0\)::integer/FALSE/g;
-+        s/\(1\)::integer/TRUE/g;
-+    }
-+
-     # Print the previouis line.
-     print NEW $last;
-     $last = $_;
diff --git a/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_element_table.pl b/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_element_table.pl
deleted file mode 100644
index c0e355dba9c6..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_element_table.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- inst/upgrade/1.9.1/rename_element_table.pl.orig	Tue Dec 20 07:37:14 2005
-+++ inst/upgrade/1.9.1/rename_element_table.pl	Thu Feb  9 02:17:16 2006
-@@ -123,7 +123,7 @@ do_sql
-     q{ALTER TABLE element_type__site ALTER COLUMN id
-       SET DEFAULT NEXTVAL('seq_element_type__site')},
-     q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
--        test_primary_key('element__site_pkey', 'element_type__site')
-+        test_primary_key('element_type__site', 'element__site_pkey')
-             ? 'element__site_pkey'
-             : 'pk_element__site__id'
-     ),
diff --git a/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl b/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl
deleted file mode 100644
index 94387a466d83..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- inst/upgrade/1.9.1/rename_instance_column.pl.orig	Tue Oct  4 05:30:43 2005
-+++ inst/upgrade/1.9.1/rename_instance_column.pl	Thu Feb  9 02:17:16 2006
-@@ -49,7 +49,7 @@ do_sql
-         ALTER TABLE media_container_tile
-         ADD CONSTRAINT fk_mc_tile__related_story
-         FOREIGN KEY (related_story__id)
--        REFERENCES media(id) ON DELETE CASCADE
-+        REFERENCES story(id) ON DELETE CASCADE
-     },
- 
-     # Add FK constraint for mediacontainer_tile.related_media__id
diff --git a/www/bricolage/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl b/www/bricolage/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl
deleted file mode 100644
index 7153bc975465..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl
+++ /dev/null
@@ -1,24 +0,0 @@
---- inst/upgrade/1.9.1/ze_job_iz_versioned.pl.orig	Tue Dec 20 07:37:14 2005
-+++ inst/upgrade/1.9.1/ze_job_iz_versioned.pl	Thu Feb  9 02:17:16 2006
-@@ -18,7 +18,9 @@ do_sql
-     # set, even though they've been published.
-     q{UPDATE story
-       SET    published_version = COALESCE(s.published_version, s.current_version),
--             publish_status    = '1'
-+             publish_status    = '1',
-+             first_publish_date = COALESCE(s.first_publish_date, s.publish_date, CURRENT_TIMESTAMP),
-+             publish_date = COALESCE(s.publish_date, s.first_publish_date, CURRENT_TIMESTAMP)
-       FROM   job j, story s
-       WHERE  story.id = s.id
-              AND j.story_instance__id = s.id
-@@ -30,7 +32,9 @@ do_sql
- 
-     q{UPDATE media
-       SET    published_version = COALESCE(m.published_version, m.current_version),
--             publish_status    = '1'
-+             publish_status    = '1',
-+             first_publish_date = COALESCE(m.first_publish_date, m.publish_date, CURRENT_TIMESTAMP),
-+             publish_date = COALESCE(m.publish_date, m.first_publish_date, CURRENT_TIMESTAMP)
-       FROM   job j, media m
-       WHERE  media.id = m.id
-              AND j.media_instance__id = m.id
diff --git a/www/bricolage/files/patch-inst_upgrade_lib_bric_upgrade.pm b/www/bricolage/files/patch-inst_upgrade_lib_bric_upgrade.pm
deleted file mode 100644
index 5375adf547ed..000000000000
--- a/www/bricolage/files/patch-inst_upgrade_lib_bric_upgrade.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- inst/upgrade/lib/bric_upgrade.pm.orig	Tue Dec 20 07:37:14 2005
-+++ inst/upgrade/lib/bric_upgrade.pm	Thu Feb  9 02:17:16 2006
-@@ -288,6 +288,7 @@ sub test_table($) {
-   exit if test_column $table_name, $column_name, $min_size;
-   exit if test_column $table_name, $column_name, undef, $not_null;
-   exit if test_column $table_name, $column_name, $min_size, $not_null;
-+  exit if test_column $table_name, $column_name, $min_size, $not_null, $type;
- 
- This function returns true if the specified column exists in specified table
- in the Bricolage database, and false if it does not. Use C<test_column()> in
diff --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index 62606f58f9fe..508d23db182e 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -91,6 +91,9 @@ bricolage/upgrade/1.9.1/ze_job_iz_versioned.pl
 bricolage/upgrade/1.10.0/delete_old_stuff.pl
 bricolage/upgrade/1.10.0/rm_old_sort_prefs.pl
 bricolage/upgrade/1.10.0/update_publish_status_check.pl
+bricolage/upgrade/1.10.1/fix_media_related_story_fk.pl
+bricolage/upgrade/1.10.1/fix_reverted_docs.pl
+bricolage/upgrade/1.10.1/textify_field_type.pl
 bricolage/comp/admin/alerts/dhandler
 bricolage/comp/admin/alerts/recip
 bricolage/comp/admin/control/publish/category.html
@@ -2612,13 +2615,16 @@ bricolage/data/burn/comp/oc_1/story.mc
 %%SITE_PERL%%/Bric/SOAP/ATType.pm
 %%SITE_PERL%%/Bric/SOAP/Auth.pm
 %%SITE_PERL%%/Bric/SOAP/Category.pm
+%%SITE_PERL%%/Bric/SOAP/ContribType.pm
 %%SITE_PERL%%/Bric/SOAP/Desk.pm
+%%SITE_PERL%%/Bric/SOAP/Destination.pm
 %%SITE_PERL%%/Bric/SOAP/ElementType.pm
 %%SITE_PERL%%/Bric/SOAP/Handler.pm
 %%SITE_PERL%%/Bric/SOAP/Keyword.pm
 %%SITE_PERL%%/Bric/SOAP/Media.pm
 %%SITE_PERL%%/Bric/SOAP/MediaType.pm
 %%SITE_PERL%%/Bric/SOAP/OutputChannel.pm
+%%SITE_PERL%%/Bric/SOAP/Preference.pm
 %%SITE_PERL%%/Bric/SOAP/Site.pm
 %%SITE_PERL%%/Bric/SOAP/Story.pm
 %%SITE_PERL%%/Bric/SOAP/Template.pm
@@ -2795,6 +2801,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.10.1
 @dirrm bricolage/upgrade/1.10.0
 @dirrm bricolage/upgrade/1.9.1
 @dirrm bricolage/upgrade/1.9.0