- Update to 1.10.3

PR:		ports/117041
Submitted by:	maintainer

5 files changed, 59 insertions, 43 deletions

diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index c88bfb051682..b8b094334aca 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.10.2
+PORTVERSION=	1.10.3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -64,7 +64,7 @@ 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 1.10.1 1.10.2
+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 1.10.2 1.10.3
 
 PERL_CONFIGURE=	5.8.0+	# Needs perl 5.8.x or later for decent unicode support
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/www/bricolage/distinfo b/www/bricolage/distinfo
index 81179cc598f2..98b3e54bbed4 100644
--- a/www/bricolage/distinfo
+++ b/www/bricolage/distinfo
@@ -1,3 +1,3 @@
-MD5 (bricolage-1.10.2.tar.gz) = 04e26c62c002c1bf3b20ebf069d53b9a
-SHA256 (bricolage-1.10.2.tar.gz) = 949eb7ec779be97aecff293ea9ed03ee944c038e0f205698b6da9c1b8edda7af
-SIZE (bricolage-1.10.2.tar.gz) = 2791306
+MD5 (bricolage-1.10.3.tar.gz) = 351489f7c1f5182b49c027b2f549e0bd
+SHA256 (bricolage-1.10.3.tar.gz) = 455eae99220d9eeff7ee8a7bfd7d7a049e6287a0891c87cb1afa762c053d6dc5
+SIZE (bricolage-1.10.3.tar.gz) = 2818329
diff --git a/www/bricolage/files/patch-Makefile b/www/bricolage/files/patch-Makefile
index bd2e3dbec790..ce583cb5cceb 100644
--- a/www/bricolage/files/patch-Makefile
+++ b/www/bricolage/files/patch-Makefile
@@ -1,7 +1,7 @@
-*** Makefile.orig	Fri Mar 17 19:26:34 2006
---- Makefile	Fri Mar 31 18:35:33 2006
+*** Makefile.orig	Thu Dec 14 17:34:20 2006
+--- Makefile	Tue Oct  9 06:14:52 2007
 ***************
-*** 19,25 ****
+*** 22,28 ****
   #
   
   # Set the location of Perl.
@@ -9,7 +9,7 @@
   
   # Blank by default, but set to QUIET to ask essential questions only
   INSTALL_VERBOSITY?= STANDARD
---- 19,25 ----
+--- 22,28 ----
   #
   
   # Set the location of Perl.
@@ -18,7 +18,7 @@
   # Blank by default, but set to QUIET to ask essential questions only
   INSTALL_VERBOSITY?= STANDARD
 ***************
-*** 184,203 ****
+*** 203,213 ****
   
   lib 		: 
   	-rm -f lib/Makefile
@@ -30,16 +30,7 @@
   
   files 		: config.db bconf/bricolage.conf
   	$(PERL) inst/files.pl
-  
-  db    		: inst/db.pl postgres.db
-! 	$(PERL) inst/db.pl
-  
-  db_grant	: inst/db.pl postgres.db
-! 	$(PERL) inst/db_grant.pl
-  
-  done		: bconf/bricolage.conf db files bin lib cpan
-  	$(PERL) inst/done.pl
---- 184,203 ----
+--- 203,213 ----
   
   lib 		: 
   	-rm -f lib/Makefile
@@ -51,6 +42,20 @@
   
   files 		: config.db bconf/bricolage.conf
   	$(PERL) inst/files.pl
+***************
+*** 216,225 ****
+  	$(PERL) inst/files.pl INSTALL HOT_COPY
+  
+  db    		: inst/db.pl postgres.db
+! 	$(PERL) inst/db.pl
+  
+  db_grant	: inst/db.pl postgres.db
+! 	$(PERL) inst/db_grant.pl
+  
+  done		: bconf/bricolage.conf db files bin lib cpan
+  	$(PERL) inst/done.pl
+--- 216,225 ----
+  	$(PERL) inst/files.pl INSTALL HOT_COPY
   
   db    		: inst/db.pl postgres.db
 ! #	$(PERL) inst/db.pl
diff --git a/www/bricolage/files/patch-bin::Makefile.PL b/www/bricolage/files/patch-bin::Makefile.PL
index 72a09b992016..506ca02d7b90 100644
--- a/www/bricolage/files/patch-bin::Makefile.PL
+++ b/www/bricolage/files/patch-bin::Makefile.PL
@@ -1,21 +1,26 @@
---- bin/Makefile.PL.orig	Mon May 24 00:10:06 2004
-+++ bin/Makefile.PL	Mon May 24 00:10:24 2004
-@@ -32,16 +32,6 @@
- 
- # Write out the Makefile
- WriteMakefile(NAME           => 'bric_bin',
--	      EXE_FILES      => \@EXE,
--	      ( exists $CONFIG->{MODULE_DIR} ? 
--		( INSTALLSITELIB => $CONFIG->{MODULE_DIR} ) :
--		()),
--	      ( exists $CONFIG->{BIN_DIR} ? 
--		( INSTALLSCRIPT => $CONFIG->{BIN_DIR},
--                  INSTALLSITEBIN => $CONFIG->{BIN_DIR} ) :
--		()),
--	      ( exists $CONFIG->{MAN_DIR} ? 
--		( INSTALLMAN1DIR => "$CONFIG->{MAN_DIR}/man1",
--                  INSTALLSITEMAN1DIR => "$CONFIG->{MAN_DIR}/man1") :
--		()));
-+              EXE_FILES      => \@EXE
-+             );
- 
+*** bin/Makefile.PL.orig	Thu Oct 19 09:16:18 2006
+--- bin/Makefile.PL	Tue Oct  9 06:17:34 2007
+***************
+*** 33,48 ****
+  # Write out the Makefile
+  WriteMakefile(NAME           => 'bric_bin',
+  	      EXE_FILES      => \@EXE,
+! 	      ( exists $CONFIG->{MODULE_DIR} ? 
+! 		( INSTALLSITELIB => $CONFIG->{MODULE_DIR} ) :
+! 		()),
+! 	      ( exists $CONFIG->{BIN_DIR} ? 
+! 		( INSTALLSCRIPT => $CONFIG->{BIN_DIR},
+!                   INSTALLSITESCRIPT => $CONFIG->{BIN_DIR},
+!                   INSTALLSITEBIN => $CONFIG->{BIN_DIR} ) :
+! 		()),
+! 	      ( exists $CONFIG->{MAN_DIR} ? 
+! 		( INSTALLMAN1DIR => "$CONFIG->{MAN_DIR}/man1",
+!                   INSTALLSITEMAN1DIR => "$CONFIG->{MAN_DIR}/man1") :
+! 		()));
+  
+--- 33,37 ----
+  # Write out the Makefile
+  WriteMakefile(NAME           => 'bric_bin',
+  	      EXE_FILES      => \@EXE,
+! 		);
+  
diff --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index ec512badb342..40b900f55c8f 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -98,6 +98,11 @@ bricolage/upgrade/1.10.2/add_asset_counts.pl
 bricolage/upgrade/1.10.2/add_ja.pl
 bricolage/upgrade/1.10.2/deleted_moved_js.pl
 bricolage/upgrade/1.10.2/fix_reverted_docs.pl
+bricolage/upgrade/1.10.3/alter_category_name_length.pl
+bricolage/upgrade/1.10.3/fix_asset_fk_constraints.pl
+bricolage/upgrade/1.10.3/fix_asset_sort_opts.pl
+bricolage/upgrade/1.10.3/fix_contri_assoc.pl
+bricolage/upgrade/1.10.3/fix_story_elementtype_spelling.pl
 bricolage/comp/admin/alerts/dhandler
 bricolage/comp/admin/alerts/recip
 bricolage/comp/admin/control/publish/category.html
@@ -2905,9 +2910,9 @@ bricolage/data/burn/comp/oc_1/story.mc
 %%SITE_PERL%%/Bric/Util/UserPref.pm
 %%SITE_PERL%%/mach/auto/Bric/.packlist
 %%SITE_PERL%%/mach/auto/bric_bin/.packlist
-share/bricolage/Pg.sql
+%%DATADIR%%/Pg.sql
 
-@dirrm share/bricolage
+@dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/Bric/Util/Trans
 @dirrm %%SITE_PERL%%/Bric/Util/Priv/Parts
 @dirrm %%SITE_PERL%%/Bric/Util/Priv
@@ -2956,6 +2961,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.3
 @dirrm bricolage/upgrade/1.10.2
 @dirrm bricolage/upgrade/1.10.1
 @dirrm bricolage/upgrade/1.10.0