ports/117041: MAINTAINER-UPDATE: Bricolage 1.10.2 to 1.10.3

Rod Taylor rbt at rbt.ca
Tue Oct 9 11:10:02 UTC 2007


>Number:         117041
>Category:       ports
>Synopsis:       MAINTAINER-UPDATE: Bricolage 1.10.2 to 1.10.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 11:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Rod Taylor
>Release:        FreeBSD 6.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD home 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #3: Tue Mar 27 13:38:08 EST 2007 root at home:/usr/obj/usr/src/sys/HOME amd64


	
>Description:
	Bricolage bug fix release.

>How-To-Repeat:
	
>Fix:

	

--- bric-1.10.3.patch begins here ---
diff -urN bricolage.orig/Makefile bricolage/Makefile
--- bricolage.orig/Makefile	Mon Oct  8 18:33:56 2007
+++ bricolage/Makefile	Tue Oct  9 06:08:16 2007
@@ -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 @@
 # 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 -urN bricolage.orig/distinfo bricolage/distinfo
--- bricolage.orig/distinfo	Sun Jul  9 19:26:03 2006
+++ bricolage/distinfo	Tue Oct  9 06:08:56 2007
@@ -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 -urN bricolage.orig/files/patch-Makefile bricolage/files/patch-Makefile
--- bricolage.orig/files/patch-Makefile	Sun Apr  2 11:03:26 2006
+++ bricolage/files/patch-Makefile	Tue Oct  9 06:15:22 2007
@@ -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 -urN bricolage.orig/files/patch-bin::Makefile.PL bricolage/files/patch-bin::Makefile.PL
--- bricolage.orig/files/patch-bin::Makefile.PL	Wed Jun 16 09:34:30 2004
+++ bricolage/files/patch-bin::Makefile.PL	Tue Oct  9 06:17:59 2007
@@ -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 -urN bricolage.orig/pkg-plist bricolage/pkg-plist
--- bricolage.orig/pkg-plist	Sun Jul  9 19:26:03 2006
+++ bricolage/pkg-plist	Tue Oct  9 06:11:13 2007
@@ -98,6 +98,11 @@
 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
@@ -2956,6 +2961,7 @@
 @dirrm %%SITE_PERL%%/Bric
 @dirrm %%SITE_PERL%%/mach/auto/Bric
 @dirrm %%SITE_PERL%%/mach/auto/bric_bin
+ at dirrm bricolage/upgrade/1.10.3
 @dirrm bricolage/upgrade/1.10.2
 @dirrm bricolage/upgrade/1.10.1
 @dirrm bricolage/upgrade/1.10.0
--- bric-1.10.3.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list