Upgrade to Apache::Gallery 0.9.1

* Report 404 for HEAD requests to non-existing files or directories
* Scale images when they are requested from the cache instead of
  before the index is displayed.
* Sort pictures the same way when viewing images as when viewing
  directories
* New option GalleryUnderscoresToSpaces to convert underscores to
  spaces in the listing of directories.
* Remember choosen width by setting a cookie
* Two new configuration options GalleryDocFile and GalleryImgFile
  that makes it possible to configured which filetypes should be
  displayed. See the documentation for details.
* Switched to use Text::Template instead of CGI::FastTemplate,
  see the UPGRADE file for details.
* Create copyright notices on pictures using truetype fonts instead
  of png images. Font, color and size can be configured.

and various bug fixes.

5 files changed, 23 insertions, 22 deletions

diff --git a/www/p5-Apache-Gallery/MESSAGE b/www/p5-Apache-Gallery/MESSAGE
index d5deed3529a..01b014b0657 100644
--- a/www/p5-Apache-Gallery/MESSAGE
+++ b/www/p5-Apache-Gallery/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/09/01 22:42:49 kim Exp $
+$NetBSD: MESSAGE,v 1.2 2005/01/23 18:26:39 kim Exp $
 
 The default Apache::Gallery templates have been installed in
 
@@ -19,5 +19,6 @@ For more configuration information, see the following files:
 
 	${AG_DOCDIR}/INSTALL
 	${AG_DOCDIR}/README
+	${AG_DOCDIR}/UPGRADE
 
 ===========================================================================
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 65600692ce7..48733d38f30 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/12/20 11:31:12 grant Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/23 18:26:39 kim Exp $
 #
 
-DISTNAME=	Apache-Gallery-0.7
+DISTNAME=	Apache-Gallery-0.9.1
 PKGNAME=	p5-${DISTNAME}
 PKGREVISION=	9
 SVR4_PKGNAME=	p5aga
@@ -17,7 +17,7 @@ DEPENDS+=	p5-URI>=1.23:../../www/p5-URI
 DEPENDS+=	p5-Image-Imlib2-[0-9]*:../../graphics/p5-Image-Imlib2
 DEPENDS+=	p5-Image-Info>=1.15:../../graphics/p5-Image-Info
 DEPENDS+=	p5-Image-Size-[0-9]*:../../graphics/p5-Image-Size
-DEPENDS+=	p5-CGI-FastTemplate-[0-9]*:../../www/p5-CGI-FastTemplate
+DEPENDS+=	p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
 DEPENDS+=	p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ}
 
 USE_BUILDLINK3=		YES
diff --git a/www/p5-Apache-Gallery/PLIST b/www/p5-Apache-Gallery/PLIST
index 017814182d1..3de039547ba 100644
--- a/www/p5-Apache-Gallery/PLIST
+++ b/www/p5-Apache-Gallery/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/21 16:21:14 kim Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 18:26:39 kim Exp $
 ${AG_SHAREDIR}/htdocs/agfolder.png
 ${AG_SHAREDIR}/htdocs/application-doc.png
-${AG_SHAREDIR}/htdocs/application-mp3.png
-${AG_SHAREDIR}/htdocs/application-ogg.png
 ${AG_SHAREDIR}/htdocs/application-pdf.png
 ${AG_SHAREDIR}/htdocs/application-rtf.png
-${AG_SHAREDIR}/htdocs/application-wav.png
 ${AG_SHAREDIR}/htdocs/c.png
 ${AG_SHAREDIR}/htdocs/gallery-default.css
 ${AG_SHAREDIR}/htdocs/gallery-new.css
+${AG_SHAREDIR}/htdocs/sound-mp3.png
+${AG_SHAREDIR}/htdocs/sound-ogg.png
+${AG_SHAREDIR}/htdocs/sound-wav.png
 ${AG_SHAREDIR}/htdocs/video-asf.png
 ${AG_SHAREDIR}/htdocs/video-avi.png
 ${AG_SHAREDIR}/htdocs/video-mov.png
diff --git a/www/p5-Apache-Gallery/distinfo b/www/p5-Apache-Gallery/distinfo
index ade1f4dd8da..5d2b4b57762 100644
--- a/www/p5-Apache-Gallery/distinfo
+++ b/www/p5-Apache-Gallery/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/07/10 22:21:40 kim Exp $
+$NetBSD: distinfo,v 1.6 2005/01/23 18:26:39 kim Exp $
 
-SHA1 (Apache-Gallery-0.7.tar.gz) = bb73d611da624d23273cebfd269156040857b6c4
-Size (Apache-Gallery-0.7.tar.gz) = 73532 bytes
-SHA1 (patch-aa) = 2e9c471751812eab55e47c1a75bf9139df1f516d
+SHA1 (Apache-Gallery-0.9.1.tar.gz) = e818c89d2b9a6d1aa63bacf149c4a259e6323284
+Size (Apache-Gallery-0.9.1.tar.gz) = 82230 bytes
+SHA1 (patch-aa) = b1f3de71ecdfdc320288c8a70bc1817da22845e3
diff --git a/www/p5-Apache-Gallery/patches/patch-aa b/www/p5-Apache-Gallery/patches/patch-aa
index 9b10a04d96f..37509ca47f3 100644
--- a/www/p5-Apache-Gallery/patches/patch-aa
+++ b/www/p5-Apache-Gallery/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/07/10 22:21:40 kim Exp $
+$NetBSD: patch-aa,v 1.6 2005/01/23 18:26:39 kim Exp $
 
---- lib/Apache/Gallery.pm.orig	2003-09-07 13:28:42.000000000 -0400
-+++ lib/Apache/Gallery.pm	2004-07-10 18:10:49.000000000 -0400
-@@ -206,9 +206,28 @@
+--- lib/Apache/Gallery.pm.orig	2005-01-23 12:02:39.000000000 -0500
++++ lib/Apache/Gallery.pm	2005-01-23 12:06:13.000000000 -0500
+@@ -253,9 +253,28 @@
  
  		# Combine directories and files to one listing
  		my @listing;
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 22:21:40 kim Exp $
  		
  		if (@listing) {
  
-@@ -272,7 +291,7 @@
+@@ -319,7 +338,7 @@
  				if (-d $thumbfilename) {
  					my $dirtitle = '';
  					if (-e $thumbfilename . ".folder") {
@@ -42,8 +42,8 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 22:21:40 kim Exp $
 +						$dirtitle = get_filecontent($thumbfilename . ".folder", 1);
  					}
  
- 					$tpl->assign(FILEURL => uri_escape($fileurl, $escape_rule), FILE => ($dirtitle ? $dirtitle : $file));
-@@ -1041,6 +1060,7 @@
+ 					$dirtitle = $dirtitle ? $dirtitle : $file;
+@@ -1226,6 +1245,7 @@
  
  sub get_filecontent {
  	my $file = shift;
@@ -51,15 +51,15 @@ $NetBSD: patch-aa,v 1.5 2004/07/10 22:21:40 kim Exp $
  	open(FH, $file) or return undef;
  	my $content = '';
  	{
-@@ -1048,6 +1068,7 @@
- 	$content = <FH>;
+@@ -1233,6 +1253,7 @@
+ 		$content = <FH>;
  	}
  	close(FH);
 +	$content =~ s/\n/<BR>\n/g if $fold;
  	return $content;
  }
  
-@@ -1145,7 +1166,7 @@
+@@ -1333,7 +1354,7 @@
  			$dirname = File::Spec->catdir($dirname, $link);
  
  			if (-e $dirname . ".folder") {