ports/80625: MAINTAINER-UPDATE: www/bricolage
Rod Taylor
ports at rbt.ca
Wed May 4 19:06:29 UTC 2005
>Number: 80625
>Category: ports
>Synopsis: MAINTAINER-UPDATE: www/bricolage
>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: Wed May 04 18:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Rod Taylor
>Release: FreeBSD 5.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD home 5.3-RELEASE FreeBSD 5.3-RELEASE #7: Tue Jan 25 02:28:10 EST 2005 root at home:/usr/obj/usr/src/sys/HOME amd64
>Description:
Upgrade Bricolage from 1.8.3 to 1.8.5. Contains lots of bug fixes.
>How-To-Repeat:
>Fix:
--- bric.patch begins here ---
diff -crN bricolage.orig/Makefile bricolage/Makefile
*** bricolage.orig/Makefile Mon Mar 28 06:39:14 2005
--- bricolage/Makefile Tue May 3 18:52:23 2005
***************
*** 6,12 ****
#
PORTNAME= bricolage
! PORTVERSION= 1.8.3
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bricolage
--- 6,12 ----
#
PORTNAME= bricolage
! PORTVERSION= 1.8.5
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bricolage
***************
*** 26,31 ****
--- 26,32 ----
${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
${SITE_PERL}/Test/Class.pm:${PORTSDIR}/devel/p5-Test-Class \
+ ${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule \
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
***************
*** 51,57 ****
MAKE_ENV+= INSTALL_VERBOSITY="QUIET"
# Used to determine which versions we can upgrade from
! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 ${PORTVERSION}
USE_REINPLACE= yes
PERL_CONFIGURE= yes
--- 52,58 ----
MAKE_ENV+= INSTALL_VERBOSITY="QUIET"
# Used to determine which versions we can upgrade from
! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 # Skip ${PORTVERSION} for 1.8.5
USE_REINPLACE= yes
PERL_CONFIGURE= yes
Binary files bricolage.orig/bricolage-1.8.5.tbz and bricolage/bricolage-1.8.5.tbz differ
diff -crN bricolage.orig/distinfo bricolage/distinfo
*** bricolage.orig/distinfo Tue Jan 25 02:21:20 2005
--- bricolage/distinfo Tue May 3 18:34:48 2005
***************
*** 1,2 ****
! MD5 (bricolage-1.8.3.tar.gz) = 20a2fbec28f9595a26224c307b2786f9
! SIZE (bricolage-1.8.3.tar.gz) = 2517168
--- 1,2 ----
! MD5 (bricolage-1.8.5.tar.gz) = b226db1637a596cd53dec6784fd3d070
! SIZE (bricolage-1.8.5.tar.gz) = 2533538
diff -crN bricolage.orig/files/patch-inst::config.pl bricolage/files/patch-inst::config.pl
*** bricolage.orig/files/patch-inst::config.pl Tue Jun 1 22:23:33 2004
--- bricolage/files/patch-inst::config.pl Tue May 3 18:43:23 2005
***************
*** 1,5 ****
! *** inst/config.pl.orig Fri Jul 25 00:39:23 2003
! --- inst/config.pl Tue Jun 1 22:23:26 2004
***************
*** 36,41 ****
--- 36,45 ----
--- 1,5 ----
! *** inst/config.pl.orig Fri Mar 18 17:12:51 2005
! --- inst/config.pl Tue May 3 18:40:57 2005
***************
*** 36,41 ****
--- 36,45 ----
***************
*** 14,25 ****
our %CONFIG;
***************
! *** 71,92 ****
END
! ! $CONFIG{set} = ask_choice("Your choice?",
! ! [ "s", "m" ], "s");
# setup the default
if ($CONFIG{set} eq 's') {
--- 14,25 ----
our %CONFIG;
***************
! *** 73,94 ****
END
! ! $CONFIG{set} = ask_choice("Your choice?",
! ! [ "s", "m" ], "m");
# setup the default
if ($CONFIG{set} eq 's') {
***************
*** 32,43 ****
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
$CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
! ! # remove man3 trailer
! $CONFIG{MAN_DIR} =~ s!/man3!!;
# construct default system-wide log directory based on Apache
# error_log setting
! --- 75,99 ----
END
--- 32,43 ----
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
$CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
! # remove man3 trailer
! $CONFIG{MAN_DIR} =~ s!/man3!!;
# construct default system-wide log directory based on Apache
# error_log setting
! --- 77,101 ----
END
***************
*** 52,70 ****
$CONFIG{TEMP_DIR} = tmpdir();
! $CONFIG{MODULE_DIR} = '/usr/local/lib/perl5/site_perl/5.8.2/ '; #$Config{sitelib};
! $CONFIG{BIN_DIR} = '/usr/local/bin'; #$Config{scriptdir};
! ! $CONFIG{MAN1_DIR} = '/usr/local/man/man1'; #$Config{man3dir};
! ! $CONFIG{MAN3_DIR} = '/usr/local/lib/perl5/5.8.2/man/man3'; #$Config{man1dir};
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
$CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
! ! # remove manN trailer
! $CONFIG{MAN1_DIR} =~ s!/man1!!;
! $CONFIG{MAN3_DIR} =~ s!/man3!!;
# construct default system-wide log directory based on Apache
# error_log setting
***************
! *** 113,119 ****
$CONFIG{TEMP_DIR} = '$CONFIG{BRICOLAGE_ROOT}/tmp';
$CONFIG{MODULE_DIR} = '$CONFIG{BRICOLAGE_ROOT}/lib';
$CONFIG{BIN_DIR} = '$CONFIG{BRICOLAGE_ROOT}/bin';
--- 52,70 ----
$CONFIG{TEMP_DIR} = tmpdir();
! $CONFIG{MODULE_DIR} = '/usr/local/lib/perl5/site_perl/5.8.2/ '; #$Config{sitelib};
! $CONFIG{BIN_DIR} = '/usr/local/bin'; #$Config{scriptdir};
! ! $CONFIG{MAN1_DIR} = '/usr/local/man/man1'; #$Config{man1dir};
! ! $CONFIG{MAN3_DIR} = '/usr/local/lib/perl5/5.8.2/man/man3'; #$Config{man3dir};
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
$CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
! # remove man3 trailer
! $CONFIG{MAN1_DIR} =~ s!/man1!!;
! $CONFIG{MAN3_DIR} =~ s!/man3!!;
# construct default system-wide log directory based on Apache
# error_log setting
***************
! *** 115,121 ****
$CONFIG{TEMP_DIR} = '$CONFIG{BRICOLAGE_ROOT}/tmp';
$CONFIG{MODULE_DIR} = '$CONFIG{BRICOLAGE_ROOT}/lib';
$CONFIG{BIN_DIR} = '$CONFIG{BRICOLAGE_ROOT}/bin';
***************
*** 72,78 ****
$CONFIG{LOG_DIR} = '$CONFIG{BRICOLAGE_ROOT}/log';
$CONFIG{PID_FILE} = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
! --- 120,127 ----
$CONFIG{TEMP_DIR} = '$CONFIG{BRICOLAGE_ROOT}/tmp';
$CONFIG{MODULE_DIR} = '$CONFIG{BRICOLAGE_ROOT}/lib';
$CONFIG{BIN_DIR} = '$CONFIG{BRICOLAGE_ROOT}/bin';
--- 72,78 ----
$CONFIG{LOG_DIR} = '$CONFIG{BRICOLAGE_ROOT}/log';
$CONFIG{PID_FILE} = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
! --- 122,129 ----
$CONFIG{TEMP_DIR} = '$CONFIG{BRICOLAGE_ROOT}/tmp';
$CONFIG{MODULE_DIR} = '$CONFIG{BRICOLAGE_ROOT}/lib';
$CONFIG{BIN_DIR} = '$CONFIG{BRICOLAGE_ROOT}/bin';
***************
*** 82,88 ****
$CONFIG{PID_FILE} = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
***************
! *** 123,129 ****
sub confirm_settings {
my $default_root = $CONFIG{BRICOLAGE_ROOT};
--- 82,88 ----
$CONFIG{PID_FILE} = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
$CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
***************
! *** 125,131 ****
sub confirm_settings {
my $default_root = $CONFIG{BRICOLAGE_ROOT};
***************
*** 90,96 ****
# make sure this directory isn't the same at the source directory
if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
! --- 131,142 ----
sub confirm_settings {
my $default_root = $CONFIG{BRICOLAGE_ROOT};
--- 90,96 ----
# make sure this directory isn't the same at the source directory
if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
! --- 133,144 ----
sub confirm_settings {
my $default_root = $CONFIG{BRICOLAGE_ROOT};
***************
*** 104,110 ****
# make sure this directory isn't the same at the source directory
if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
***************
! *** 140,163 ****
-e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
print "That directory already contains a Bricolage installation.\n";
print "Consider running `make upgrade`, instead.\n";
--- 104,110 ----
# make sure this directory isn't the same at the source directory
if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
***************
! *** 142,165 ****
-e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
print "That directory already contains a Bricolage installation.\n";
print "Consider running `make upgrade`, instead.\n";
***************
*** 129,135 ****
- ask_confirm("Mason Component Directory", \$CONFIG{MASON_COMP_ROOT});
- ask_confirm("Mason Data Directory", \$CONFIG{MASON_DATA_ROOT});
}
! --- 153,190 ----
-e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
print "That directory already contains a Bricolage installation.\n";
print "Consider running `make upgrade`, instead.\n";
--- 129,135 ----
- ask_confirm("Mason Component Directory", \$CONFIG{MASON_COMP_ROOT});
- ask_confirm("Mason Data Directory", \$CONFIG{MASON_DATA_ROOT});
}
! --- 155,192 ----
-e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
print "That directory already contains a Bricolage installation.\n";
print "Consider running `make upgrade`, instead.\n";
diff -crN bricolage.orig/pkg-plist bricolage/pkg-plist
*** bricolage.orig/pkg-plist Tue Mar 22 17:35:41 2005
--- bricolage/pkg-plist Tue May 3 18:36:00 2005
***************
*** 32,37 ****
--- 32,38 ----
bricolage/upgrade/1.8.3/media_uri_pk.pl
bricolage/upgrade/1.8.3/story_uri_pk.pl
bricolage/upgrade/1.8.3/worfkow_type_ck.pl
+ bricolage/upgrade/1.8.4/replace_action_media_types.pl
bricolage/comp/admin/alerts/dhandler
bricolage/comp/admin/alerts/recip
bricolage/comp/admin/control/change_user/dhandler
***************
*** 2947,2952 ****
--- 2948,2954 ----
@dirrm %%SITE_PERL%%/Bric
@dirrm %%SITE_PERL%%/mach/auto/Bric
@dirrm %%SITE_PERL%%/mach/auto/bric_bin
+ @dirrm bricolage/upgrade/1.8.4
@dirrm bricolage/upgrade/1.8.3
@dirrm bricolage/upgrade/1.8.2
@dirrm bricolage/upgrade/1.8.1
--- bric.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list