ports/72921: MAINTAINER-UPDATE: Upgrade www/bricolage to 1.8.2

[Rod Taylor]

>Number:         72921
>Category:       ports
>Synopsis:       MAINTAINER-UPDATE: Upgrade www/bricolage to 1.8.2
>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 Oct 20 12:00:50 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rod Taylor
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD home 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Sun Feb 29 13:14:24 EST 2004 root at home:/usr/obj/usr/src/sys/HOME i386


	
>Description:
	Upgrade Bricolage from 1.8.1 to 1.8.2
	Change dependencies to use mod_perl as a DSO by default.

>How-To-Repeat:
	
>Fix:

	Add an UPDATING message with the following text:

	Bricolage may now be run on mod_perl compiled as a DSO for Apache
	when following these guidelines:

		http://perl.apache.org/docs/1.0/guide/install.html#When_DSO_can_be_Used

	To do this, you will need to:

		pkg_delete -f apache-mod_perl
		pkg_delete -f p5-libapreq-static
		portupgrade -rR bricolage

	Bricolage will rebuild mod_perl, apache and libapreq using their standard
	versions.

--- bricolage.patch begins here ---
diff -ruN bricolage.orig/Makefile bricolage/Makefile
--- bricolage.orig/Makefile	Fri Aug 20 19:33:38 2004
+++ bricolage/Makefile	Tue Oct 19 11:00:14 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bricolage
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bricolage
@@ -14,8 +14,7 @@
 MAINTAINER=	ports at rbt.ca
 COMMENT=	A full-featured, open-source content-management and publishing system
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13-modperl \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
 		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -38,19 +37,21 @@
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
-		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq-static \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/MasonX/Interp/WithCallbacks.pm:${PORTSDIR}/www/p5-MasonX-Interp-WithCallbacks \
 		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
 		${SITE_PERL}/HTTP/BrowserDetect.pm:${PORTSDIR}/www/p5-HTTP-BrowserDetect
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${BUILD_DEPENDS}
 
 APXS?=		${LOCALBASE}/sbin/apxs
 
 MAKE_ENV+=	INSTALL_VERBOSITY="QUIET"
 
 # Used to determine which versions we can upgrade from
-PREVIOUS_VERSIONS=	1.8.0 1.8.1
+PREVIOUS_VERSIONS=	1.8.0 1.8.1 ${PORTVERSION}
 
 USE_REINPLACE=	yes
 PERL_CONFIGURE=	yes
diff -ruN bricolage.orig/distinfo bricolage/distinfo
--- bricolage.orig/distinfo	Fri Aug 20 19:33:38 2004
+++ bricolage/distinfo	Tue Oct 19 10:58:53 2004
@@ -1,2 +1,2 @@
-MD5 (bricolage-1.8.1.tar.gz) = 93525168d152ac12f438b3ae6b4ac669
-SIZE (bricolage-1.8.1.tar.gz) = 2267893
+MD5 (bricolage-1.8.2.tar.gz) = e91150571658a5289c0521b5bfa313b2
+SIZE (bricolage-1.8.2.tar.gz) = 2282281
diff -ruN bricolage.orig/pkg-plist bricolage/pkg-plist
--- bricolage.orig/pkg-plist	Fri Aug 20 19:33:38 2004
+++ bricolage/pkg-plist	Wed Oct 20 07:38:19 2004
@@ -15,6 +15,13 @@
 bricolage/upgrade/1.8.1/contrib_type_secret.pl
 bricolage/upgrade/1.8.1/fix_orphan_assets.pl
 bricolage/upgrade/1.8.1/grp_grp_name.pl
+bricolage/upgrade/1.8.2/add_missing_job_constraints.pl
+bricolage/upgrade/1.8.2/add_missing_job_fks.pl
+bricolage/upgrade/1.8.2/default_media_type.pl
+bricolage/upgrade/1.8.2/delete_old_jobs.pl
+bricolage/upgrade/1.8.2/delete_template_obj_files.pl
+bricolage/upgrade/1.8.2/job_text_columns.pl
+bricolage/upgrade/1.8.2/media_type_not_null.pl
 bricolage/comp/admin/alerts/dhandler
 bricolage/comp/admin/alerts/recip
 bricolage/comp/admin/control/change_user/dhandler
@@ -2771,6 +2778,7 @@
 @dirrm %%SITE_PERL%%/Bric
 @dirrm %%SITE_PERL%%/mach/auto/Bric
 @dirrm %%SITE_PERL%%/mach/auto/bric_bin
+ at dirrm bricolage/upgrade/1.8.2
 @dirrm bricolage/upgrade/1.8.1
 @dirrm bricolage/upgrade/1.8.0
 @dirrm bricolage/upgrade/lib
--- bricolage.patch ends here ---


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