- updated to 1.39

- took maintainership for package
- cleanup up Makefile
- introduced options.mk file for the package
  p5-Cache-Cache is set to default, modperl has been removed from the
  default options, added to options.mk
  fcgi has been added to options.mk for lighttpd usage
- MESSAGE file entry edited for lighttpd webserver

ChangeLog:
Revision history for HTML::Mason.

An HTML version of this file, complete with links to documentation, is
available at http://www.masonhq.com/code/history.html.

** denotes an incompatible change

1.39  Jan 30, 2008

    [ ENHANCEMENTS ]

    - CHI may now be used as the backend for $m->cache as an updated
  alternative to Cache::Cache.  Among other things, this facilitates
  easy use of Cache::FastMmap and memcached for data
  caching. Cache::Cache is still the default for now, and is still
  listed as a prereq for Mason.

1.38  Dec 20, 2007

    [ BUG FIXES ]

    - (Hopefully) fixed a problem where the cpan shell thought that Mason
  needed mod_perl1 as a prereq when it was trying to require a newish
  version of mod_perl2.

    - If you called $r->send_http_header() explicitly in a component under
  mod_perl 1.x, headers would end up getting sent again once the
  component finished executing. Reported by Brett Gardner.

    - Component call with content end tags could not span multiple
  lines. Fixing this makes it consistent with the opening tag. Patch
  by Alex Robinson.

    - Includes a possible fix for a test failure in 10-cache.t. This
  failure is a problem in the test code, not the Mason core code.

1.37  Sep 6, 2007

    [ BUG FIXES ]

    - Mason could send the HTTP headers twice under mod_perl 1.x when
  making a request for a directory path that was handled by a
  dhandler. Reported by David Beaudet.

    - If you set the Content-Type header in a handler sub before passing
  control to Mason via ApacheHandler, this value was overwritten if
  the request was for a directory path.

    [ ENHANCEMENTS ]

    - Make t/08-ah.t and t/16-live-cgi.t more verbose about why they are
  skipping tests when they do so. Based on a patch from
  C.J. Adams-Collier.

1.36  Jun 10, 2007

    [ BUG FIXES ]

    - If a component with content call ending tag appeared inside a
  subcomp or method without an opening tag, then the compiler dies
  with a Perl error, rather than reporting the error
  usefully. Reported by Rich Williams.

    - Under mod_perl 2, if decline_dirs was false and a directory was
  requested, you got a "Use of uninitialized value" warning from
  ApacheHandler in your logs. Reported by Ogden Nefix.

    - HTML::Entities is now a prereq. Not requiring it made for various
  weird gyrations in the tests that didn't seem to work all the time,
  causing various failures. Fixes RT #24827.

    - Request::CGIHandler->exec() now returns the return value from
  executing the component, just like a normal Request. Reported by
  Adrian Irving-Beer.

    [ ENHANCEMENTS ]

    - Added a new Compiler::ToObject parameter,
  named_component_subs. Turning this on makes it possible to profile
  components.

    - Added a new Request parameter, component_error_handler. This can be
  set to change how component compilation and runtime errors are
  handled. It can also be set to false to just let errors go
  unhandled, which could speed up apps that throw a lot of non-object
  exceptions.

1.35  Oct 17, 2006

    [ BUG FIXES ]

    - Version 1.34 introduced a bug that caused corruption of the callers
      stack when a component call with content was used.

    - When Mason tried to load a package required for a feature (like
      Cache::Cache for $m->cache) and this failed, the error message would
      say something like "Can't locate Cache::Cache". However, the real
      error could be that Cache::Cache was present, but a module required by
      Cache::Cache was not. Now we report the real missing module.

    - Some people saw a spurious test failure in 05-request.t. RT #22099.

    - Added Module::Build to the build_requires prereqs.

1.34  Oct 14, 2006

    [ BUG FIXES ]

    - List Module::Build as a build prereq in the Build.PL, so it shows up
      in META.yml. Reported by Colin Henein. RT #22097.

    - Apache::Request and mod_perl{1,2} will no longer show up as prereqs
      in META.yml. Requested by Jesse Vincent.

    - Fixed a serious memory leak bug where an object referenced in
      arguments to another component was never destroyed. Reported by
      Dominic Mitchell.

    - Using $m->call_next from a helper component should reset base_comp
      to the request_comp.  Reported by Mark Elrod.

    - The 08-ah.t and 16-live-cgi.t test files could fail with an error
      like "Failed to re-load 'Mason::Build'" when Mason was being installed
      via the CPANPLUS shell (and maybe other cases). Reported by David
      Wheeler.

    - Fixed a bug where $m->clear_buffer inside a component called from a
      comp_with_content did not clear all buffers.

    [ ENHANCEMENTS ]

    - Added support for get_server_port() in FakeApache. Patch from Dieter
      Piercey.

1.33  May 28, 2006

    [ BUG FIXES ]

    - If $m->flush_buffer() was called when there was a filter somewhere
      in the component chain, the flush did nothing. Task id #596. Reported
      by Shane McCarron.

    - Added several tests for $m->flush_buffer() and $m->clear_buffer(),
      which will hopefully avoid more bugs in this part of the code.

    - On Win32, a test failed when Mason tried to use rename to move a dir
      into an existing dir. Patch by Shane McCarron. Task id #594 and RT
      #17828.

    - Trying to load HTML::Mason::ApacheHandler outside of mod_perl caused
      an error "like Undefined subroutine &Apache::perl_hook called at
      /usr/local/share/perl/5.8.7/HTML/Mason/ApacheHandler.pm line
      257". While it will never _run_ outside of mod_perl, it should at
      least load.

    - Fixed test in 14a-fake_apache.t that failed with CGI.pm >= 3.16.

    - The example code in the HTML::Mason::Resolver::Null code was
      just wrong. Fixed by John Siracusa.

    - Fixed a test failure in 06-compile.t when using bleadperl. RT
      #17118.

1.32  January 3, 2006

    [ BUG FIXES ]

    - Under mod_perl 1.x with error_mode set to output, the headers were
      sent after the content when a compilation error occurred.  Reported by
      Gareth Kirwan.  Task id #592.

    - URI-escape utf8 characters the same way that CGI::escape and
      URI::Escape::uri_escape_utf8 do.  Patch by Denis Shaposhnikov.

    - On startup Mason creates a file named ".__obj_create_marker" in the
      object directory.  Under mod_perl, Mason was not chmod'ing the file
      when Apache was started as root. This led to permission errors in
      environments where the Interp is created anew every request.  Task id
      #593.

    - Treat the return value of component execution as a string in
      ApacheHandler.  This prevent warnings about comparing the empty string
      to a number when a component returns "".  Reported by Benjamin Franz.

    - Setting a MasonPlugins Apache parameter caused a fatal error.  Patch
      by David Jack Olrik.

    - Calling base_comp() on the Request object inside a plugin's
      start_request_hook method caused an infinite recursion in Mason.
      Reported by Jesse Vincent.

4 files changed, 57 insertions, 34 deletions

diff --git a/www/p5-HTML-Mason/MESSAGE b/www/p5-HTML-Mason/MESSAGE
index f3950da5997..c0b39bcfc37 100644
--- a/www/p5-HTML-Mason/MESSAGE
+++ b/www/p5-HTML-Mason/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/10/01 21:29:32 heinz Exp $
+$NetBSD: MESSAGE,v 1.2 2008/07/22 21:41:55 rhaen Exp $
 
 In order to use HTML::Mason with mod_perl and Apache you have to create
 the "data directory" (aka data_dir), which is used by Mason for various
@@ -15,4 +15,11 @@ to add the following line to httpd.conf:
 
 For more details, have a look at the "Mason Administrator's Manual" at
 http://www.masonhq.com/.
+
+
+It's also possible to use HTML::Mason with lighttpd and FastCGI. There
+is a recipe for it in the Trac system of lighttpd. For more details,
+have a look at the recipe at
+
+http://trac.lighttpd.net/trac/wiki/MasonRecipe
 ===========================================================================
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 8a3034e7075..5b2a74789a0 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,46 +1,27 @@
-# $NetBSD: Makefile,v 1.28 2007/10/01 21:29:32 heinz Exp $
+# $NetBSD: Makefile,v 1.29 2008/07/22 21:41:55 rhaen Exp $
 
-DISTNAME=		HTML-Mason-1.3101
-PKGNAME=		p5-HTML-Mason-1.31.1
-PKGREVISION=		4
-SVR4_PKGNAME=		p5hma
+DISTNAME=		HTML-Mason-1.39
+PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=	p5hma
 CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		rhaen@NetBSD.org
 HOMEPAGE=		http://www.masonhq.com/
 COMMENT=		Perl-based web site development and delivery system
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
-DEPENDS+=		p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
-DEPENDS+=		p5-Exception-Class>=1.14:../../devel/p5-Exception-Class
-DEPENDS+=		p5-Class-Container>=0.10:../../devel/p5-Class-Container
-
-USE_LANGUAGES=		# empty
+DEPENDS+=		p5-Class-Container>=0.07:../../devel/p5-Class-Container
+DEPENDS+=		p5-Exception-Class>=1.15:../../devel/p5-Exception-Class
+DEPENDS+=		p5-Params-Validate>=0.70:../../devel/p5-Params-Validate
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/HTML/Mason/.packlist
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
-PKG_SUPPORTED_OPTIONS=	modperl
-PKG_SUGGESTED_OPTIONS=	modperl
-
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmodperl)
-.  include "../../mk/apache.mk"
-.  if ${PKG_APACHE} == "apache13"
-DEPENDS+=	p5-libapreq>=0.32:../../www/p5-libapreq
-.    include "../../www/ap-perl/buildlink3.mk"
-.  elif ${PKG_APACHE} == "apache2" || ${PKG_APACHE} == "apache22"
-DEPENDS+=	p5-libapreq2-[0-9]*:../../www/p5-libapreq2
-.    include "../../www/ap2-perl/buildlink3.mk"
-.  endif
-.endif
+.include "options.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q}
diff --git a/www/p5-HTML-Mason/distinfo b/www/p5-HTML-Mason/distinfo
index 2b538d3b75a..3ee53143eea 100644
--- a/www/p5-HTML-Mason/distinfo
+++ b/www/p5-HTML-Mason/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2005/09/26 16:57:57 cube Exp $
+$NetBSD: distinfo,v 1.11 2008/07/22 21:41:56 rhaen Exp $
 
-SHA1 (HTML-Mason-1.3101.tar.gz) = d001f500b6ba1135704d0266e8a165e20df1258b
-RMD160 (HTML-Mason-1.3101.tar.gz) = aac9f8145c93727c31a58350c9600085da96621d
-Size (HTML-Mason-1.3101.tar.gz) = 386074 bytes
+SHA1 (HTML-Mason-1.39.tar.gz) = 4128ac437d2e4b1de48972f3231c135cc475a43e
+RMD160 (HTML-Mason-1.39.tar.gz) = 2b2752db13c5755360154186d22576fefb41ab2c
+Size (HTML-Mason-1.39.tar.gz) = 394398 bytes
diff --git a/www/p5-HTML-Mason/options.mk b/www/p5-HTML-Mason/options.mk
new file mode 100644
index 00000000000..e0ddf288926
--- /dev/null
+++ b/www/p5-HTML-Mason/options.mk
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2008/07/22 21:41:56 rhaen Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
+PKG_SUPPORTED_OPTIONS=	cache fcgi modperl
+PKG_SUGGESTED_OPTIONS=	cache
+
+.include "../../mk/bsd.options.mk"
+
+###
+### mod_perl usage for Apache webservers
+###
+.if !empty(PKG_OPTIONS:Mmodperl)
+.  include "../../mk/apache.mk"
+.  if ${PKG_APACHE} == "apache13"
+DEPENDS+=	p5-libapreq>=0.32:../../www/p5-libapreq
+.    include "../../www/ap-perl/buildlink3.mk"
+.  elif ${PKG_APACHE} == "apache2" || ${PKG_APACHE} == "apache22"
+DEPENDS+=	p5-libapreq2-[0-9]*:../../www/p5-libapreq2
+.    include "../../www/ap2-perl/buildlink3.mk"
+.  endif
+.endif
+
+###
+### FastCGI Support e.g. for lighttpd
+###
+.if !empty(PKG_OPTIONS:Mfcgi)
+DEPENDS+=	p5-FCGI-[0-9]*:../../www/p5-FCGI
+.endif
+
+###
+### The Perl module Cache-Cache for optional caching
+###
+.if !empty(PKG_OPTIONS:Mcache)
+DEPENDS+=	p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
+.endif