Upgraded to Apache::Gallery 0.7:

- Support mod_perl version 1 and 2 (1.99) (Michael Legart)
- Send status code 500 on errors, 404 on file not found and
  make IE show our own errorpage. (Thomas L. Kjeldsen)
- Bugfix for directories named "0" (Andreas Plesner Jacobsen)
- Added "selection mode". Select images with checkboxes and
  get a list of filenames. (Peter Andreasen)
- Fix to let the module work with perl 5.005 (Aaron)
- Do not allow scaling pictures to sizes above their
  original size (Aaron)
- Added GalleryUseFileDate option to make A::G show
  the files timestamps instead of using the EXIF value (Dennis Haney)
- Remember display size when turning Slideshow off (Hans Joergensen)
- Nice new layout (Thomas Kjaer)
- New option GalleryEXIFMode to control the way EXIF
  info is displayed. See docs for details (Michael Legart)
- Support for the FNumber EXIF value (Thomas Corell)
- Added GalleryRootText option to allow changing the name of
  the root element in the menu (Christopher Knight)
- Use Image::Imlib2 instead of Inline::C (Andreas Plesner Jacobsen)
- New option GalleryMaxThumbnailsPerPage to limit the number
  of thumbnails displayed per page. Disabled by default
  and requires templates update. (Michael Legart)
- Bugfix for the GalleryThumbnailSize option. Both height and
  width max sizes are now obeyed. (David Gee)

5 files changed, 74 insertions, 57 deletions

diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index c1d4af74d14..750ae459993 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/09/06 03:52:07 kim Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/21 16:21:14 kim Exp $
 #
 
-DISTNAME=	Apache-Gallery-0.6
+DISTNAME=	Apache-Gallery-0.7
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5aga
 CATEGORIES=	www graphics
@@ -11,11 +11,12 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://apachegallery.dk/
 COMMENT=	Perl5/Apache module for handling image directories
 
-DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
+DEPENDS+=	p5-URI>=1.23:../../www/p5-URI
+DEPENDS+=	p5-Image-Imlib2-[0-9]*:../../graphics/p5-Image-Imlib2
 DEPENDS+=	p5-Image-Info-[0-9]*:../../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-Inline-[0-9]*:../../devel/p5-Inline
 DEPENDS+=	p5-libapreq-[0-9]*:../../www/p5-libapreq
 
 USE_BUILDLINK2=		YES
@@ -49,20 +50,27 @@ PLIST_SUBST+=		AG_SHAREDIR=${AG_SHAREDIR:S,${PREFIX}/,,}
 CONF_FILES=		${AG_EGDIR}/${AG}.conf ${PKG_SYSCONFDIR}/${AG}.conf
 
 post-patch:
-	cd ${WRKSRC}/lib/Apache && \
+	@cd ${WRKSRC}/lib/Apache && \
 	${CP} -p Gallery.pm Gallery.pm.orig && \
 	${SED} ${FILES_SUBST_SED} Gallery.pm.orig > Gallery.pm && \
 	${RM} -f Gallery.pm.orig
+	@${MV} -f ${WRKSRC}/templates/default/gallery.css \
+	    ${WRKSRC}/htdocs/gallery-default.css
+	@${MV} -f ${WRKSRC}/templates/new/gallery.css \
+	    ${WRKSRC}/htdocs/gallery-new.css
 
 post-build:
-	@cd ${WRKSRC}/templates; \
-	for i in *.tpl; \
+	@for j in default new; \
 	do \
-	    ${CP} -p $$i $$i.orig && \
-	    ${SED} -e 's,/icons/,/${AG}/,' \
-		   -e 's,/gallery.css,/${AG}/gallery.css,' \
-		$$i.orig > $$i; \
-	    ${RM} -f $$i.orig; \
+	    cd ${WRKSRC}/templates/$$j && \
+	    for i in *.tpl; \
+	    do \
+		${CP} -p $$i $$i.orig && \
+		${SED} -e "s,/icons/,/${AG}/," \
+		       -e "s,/gallery.css,/${AG}/gallery-$$j.css," \
+		    $$i.orig > $$i; \
+		${RM} -f $$i.orig; \
+	    done; \
 	done
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/ag.conf > ${WRKDIR}/${AG}.conf
 
diff --git a/www/p5-Apache-Gallery/PLIST b/www/p5-Apache-Gallery/PLIST
index de8913d4b96..017814182d1 100644
--- a/www/p5-Apache-Gallery/PLIST
+++ b/www/p5-Apache-Gallery/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/06 03:52:07 kim Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/21 16:21:14 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/folder.png
-${AG_SHAREDIR}/htdocs/gallery.css
+${AG_SHAREDIR}/htdocs/c.png
+${AG_SHAREDIR}/htdocs/gallery-default.css
+${AG_SHAREDIR}/htdocs/gallery-new.css
 ${AG_SHAREDIR}/htdocs/video-asf.png
 ${AG_SHAREDIR}/htdocs/video-avi.png
 ${AG_SHAREDIR}/htdocs/video-mov.png
@@ -14,27 +16,50 @@ ${AG_SHAREDIR}/htdocs/video-mpeg.png
 ${AG_SHAREDIR}/htdocs/video-mpg.png
 ${AG_SHAREDIR}/htdocs/video-wmv.png
 @dirrm ${AG_SHAREDIR}/htdocs
-${AG_SHAREDIR}/templates/dircomment.tpl
-${AG_SHAREDIR}/templates/directory.tpl
-${AG_SHAREDIR}/templates/error.tpl
-${AG_SHAREDIR}/templates/file.tpl
-${AG_SHAREDIR}/templates/index.tpl
-${AG_SHAREDIR}/templates/info.tpl
-${AG_SHAREDIR}/templates/interval.tpl
-${AG_SHAREDIR}/templates/intervalactive.tpl
-${AG_SHAREDIR}/templates/layout.tpl
-${AG_SHAREDIR}/templates/navpicture.tpl
-${AG_SHAREDIR}/templates/nodircomment.tpl
-${AG_SHAREDIR}/templates/nopictureinfo.tpl
-${AG_SHAREDIR}/templates/orig.tpl
-${AG_SHAREDIR}/templates/picture.tpl
-${AG_SHAREDIR}/templates/pictureinfo.tpl
-${AG_SHAREDIR}/templates/refresh.tpl
-${AG_SHAREDIR}/templates/scale.tpl
-${AG_SHAREDIR}/templates/scaleactive.tpl
-${AG_SHAREDIR}/templates/showpicture.tpl
-${AG_SHAREDIR}/templates/slideshowisoff.tpl
-${AG_SHAREDIR}/templates/slideshowoff.tpl
+${AG_SHAREDIR}/templates/default/dircomment.tpl
+${AG_SHAREDIR}/templates/default/directory.tpl
+${AG_SHAREDIR}/templates/default/error.tpl
+${AG_SHAREDIR}/templates/default/file.tpl
+${AG_SHAREDIR}/templates/default/index.tpl
+${AG_SHAREDIR}/templates/default/info.tpl
+${AG_SHAREDIR}/templates/default/interval.tpl
+${AG_SHAREDIR}/templates/default/intervalactive.tpl
+${AG_SHAREDIR}/templates/default/layout.tpl
+${AG_SHAREDIR}/templates/default/navpicture.tpl
+${AG_SHAREDIR}/templates/default/nodircomment.tpl
+${AG_SHAREDIR}/templates/default/nopictureinfo.tpl
+${AG_SHAREDIR}/templates/default/orig.tpl
+${AG_SHAREDIR}/templates/default/picture.tpl
+${AG_SHAREDIR}/templates/default/pictureinfo.tpl
+${AG_SHAREDIR}/templates/default/refresh.tpl
+${AG_SHAREDIR}/templates/default/scale.tpl
+${AG_SHAREDIR}/templates/default/scaleactive.tpl
+${AG_SHAREDIR}/templates/default/showpicture.tpl
+${AG_SHAREDIR}/templates/default/slideshowisoff.tpl
+${AG_SHAREDIR}/templates/default/slideshowoff.tpl
+@dirrm ${AG_SHAREDIR}/templates/default
+${AG_SHAREDIR}/templates/new/dircomment.tpl
+${AG_SHAREDIR}/templates/new/directory.tpl
+${AG_SHAREDIR}/templates/new/error.tpl
+${AG_SHAREDIR}/templates/new/file.tpl
+${AG_SHAREDIR}/templates/new/index.tpl
+${AG_SHAREDIR}/templates/new/info.tpl
+${AG_SHAREDIR}/templates/new/interval.tpl
+${AG_SHAREDIR}/templates/new/intervalactive.tpl
+${AG_SHAREDIR}/templates/new/layout.tpl
+${AG_SHAREDIR}/templates/new/navpicture.tpl
+${AG_SHAREDIR}/templates/new/nodircomment.tpl
+${AG_SHAREDIR}/templates/new/nopictureinfo.tpl
+${AG_SHAREDIR}/templates/new/orig.tpl
+${AG_SHAREDIR}/templates/new/picture.tpl
+${AG_SHAREDIR}/templates/new/pictureinfo.tpl
+${AG_SHAREDIR}/templates/new/refresh.tpl
+${AG_SHAREDIR}/templates/new/scale.tpl
+${AG_SHAREDIR}/templates/new/scaleactive.tpl
+${AG_SHAREDIR}/templates/new/showpicture.tpl
+${AG_SHAREDIR}/templates/new/slideshowisoff.tpl
+${AG_SHAREDIR}/templates/new/slideshowoff.tpl
+@dirrm ${AG_SHAREDIR}/templates/new
 @dirrm ${AG_SHAREDIR}/templates
 @dirrm ${AG_SHAREDIR}
 ${AG_DOCDIR}/Changes
diff --git a/www/p5-Apache-Gallery/distinfo b/www/p5-Apache-Gallery/distinfo
index db72398ab9e..57c19a06612 100644
--- a/www/p5-Apache-Gallery/distinfo
+++ b/www/p5-Apache-Gallery/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/09/06 03:52:07 kim Exp $
+$NetBSD: distinfo,v 1.3 2003/09/21 16:21:15 kim Exp $
 
-SHA1 (Apache-Gallery-0.6.tar.gz) = de66cfe0698e28124b2c014eec34e6043f99d14f
-Size (Apache-Gallery-0.6.tar.gz) = 66429 bytes
-SHA1 (patch-aa) = 2861bf08ee146ba660dc83fa6fe0c3a3c1506c55
+SHA1 (Apache-Gallery-0.7.tar.gz) = bb73d611da624d23273cebfd269156040857b6c4
+Size (Apache-Gallery-0.7.tar.gz) = 73532 bytes
diff --git a/www/p5-Apache-Gallery/files/ag.conf b/www/p5-Apache-Gallery/files/ag.conf
index 7ff8f57a108..01d9a78f3e5 100644
--- a/www/p5-Apache-Gallery/files/ag.conf
+++ b/www/p5-Apache-Gallery/files/ag.conf
@@ -1,4 +1,4 @@
-# $NetBSD: ag.conf,v 1.2 2003/09/06 03:52:08 kim Exp $
+# $NetBSD: ag.conf,v 1.3 2003/09/21 16:21:16 kim Exp $
 #
 # Configuration fragment for Apache::Gallery
 #
@@ -7,7 +7,7 @@
 # Default settings
 #
 
-PerlSetVar GalleryTemplateDir @AG_SHAREDIR@/templates
+PerlSetVar GalleryTemplateDir @AG_SHAREDIR@/templates/default
 
 #
 # Files referred by default templates
diff --git a/www/p5-Apache-Gallery/patches/patch-aa b/www/p5-Apache-Gallery/patches/patch-aa
deleted file mode 100644
index 982b5c981e7..00000000000
--- a/www/p5-Apache-Gallery/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/09/06 03:52:08 kim Exp $
-
---- lib/Apache/Gallery.pm.orig	2003-04-21 07:26:51.000000000 -0400
-+++ lib/Apache/Gallery.pm	2003-06-29 16:50:09.000000000 -0400
-@@ -25,8 +25,8 @@
- my $escape_rule = "^A-Za-z0-9\-_.!~*'()\/";
- 
- use Inline (C => Config => 
--				LIBS => '-L/usr/X11R6/lib -lImlib2 -lm -ldl -lXext -lXext',
--				INC => '-I/usr/X11R6/include',
-+				LIBS => '-lImlib2',
-+				INC => '-I@LOCALBASE@/include -I@X11BASE@/include',
- 				UNTAINT => 1,
- 				DIRECTORY => File::Spec->tmpdir()
- 			);