pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/p5-Apache-Gallery Apache-Gallery: update to 1.0.2.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5414315a236d
branches:  trunk
changeset: 377561:5414315a236d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 18 09:14:19 2018 +0000

description:
Apache-Gallery: update to 1.0.2.

Based on wip/p5-Apache-Gallery by mef@
Many dependencies re-added.

1.0.2 Wed Jun  8 20:47:16 CEST 2011

        - Extended GalleryUnderscoresToSpaces to filenames as well.
          (Debian bug #348724, Francesco Potort?)
        - Added txt to GalleryDocFile, the code in Gallery.pm already
          allowed it.  (Luca Capello)
        - Added text-html.png and text-txt.png icons.
          (Debian bug #423004, Luca Capello)
        - Fixed counter typo for <directory>.folder in next directory
          menu item.  (Luca Capello)
        - Added support to ignore items through <directory|file>.ignore.
          (Debian bug #619625, Luca Capello)
        - Fixed spelling typos in Gallery.pm and README.  (Luca Capello)
        - GalleryCacheDir defaults to /var/cache/www/ per the FHS-2.3.
          (Debian bug #337197, Luca Capello)
        - Fixed two minor POD errors (Michael Legart)

1.0.1 Wed Feb 23 20:45:38 CET 2011

        - Added missing template files to MANIFEST

1.0 Tue Feb 22 21:54:31 CET 2011

        - Handle files that match both GalleryDocFile and GalleryImgFile
          correctly. (Claus Faerber)
        - Only respond to HEAD and GET requests, enabling users to use
          WebDAV for upload (Andreas Plesner)
        - Added new option GalleryCommentExifKey to get comments from
          EXIF data (Michael Legart)
        - Added new option GalleryEnableMediaRss to enable generation of
          a media RSS feed for each directory listing. This works with
          e.g. the plugin from http://piclens.com to enable 3D viewing
          of your gallery. (Michael Legart)
        - Make browser-caching work with mod_perl 2. Supports If-None-Match
          and If-Modified-Since headers. Sets Last-Modified-Date and
          ETag headers. (Michael Legart)

1.0RC3 Fri Sep 16 10:27:48 CEST 2005

        - Add watermark even when picture doesn't need to be rescaled
          (Andreas Plesner)
        - Fix logging to work in Apache 1.3 (Andreas Plesner)
        - Bugfix: If only one GallerySize was specified, the image's
          max width was autmatically added to GallerySizes
          (Andreas Plesner)
        - Bugfix: Locate thm files if they are called .thm or .THM
                (Michael Legart)

1.0RC2 Wed Jun  1 09:11:50 CEST 2005

        - Added access keys for navigation (Michael Knudsen)

1.0RC1 Tue May 24 13:31:50 CEST 2005

        - Added submit button to form in selection mode (Vlad Marchenko)
        - Added new option GalleryRootPath for use when the gallery
          is not running from the root of the virtual host (Lubomir Host)
        - Report proper errors when there are problems with templates (Don Armstrong)
        - Support newest mod_perl2 version (Philip Paeps)

diffstat:

 www/p5-Apache-Gallery/MESSAGE          |   24 --
 www/p5-Apache-Gallery/Makefile         |  102 +-------
 www/p5-Apache-Gallery/PLIST            |   65 -----
 www/p5-Apache-Gallery/distinfo         |   10 +-
 www/p5-Apache-Gallery/files/ag.conf    |   25 --
 www/p5-Apache-Gallery/patches/patch-aa |  362 ---------------------------------
 6 files changed, 25 insertions(+), 563 deletions(-)

diffs (truncated from 631 to 300 lines):

diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/MESSAGE
--- a/www/p5-Apache-Gallery/MESSAGE     Sun Mar 18 09:05:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/09/28 14:15:50 rillig Exp $
-
-The default Apache::Gallery templates have been installed in
-
-    ${AG_SHAREDIR}/templates
-
-The templates refer to icons and stylesheets, that need to be accessible
-through your HTTP server.  If you are running Apache, then you may either
-symlink
-
-       ln -s ${AG_SHAREDIR}/htdocs ${AG}
-
-in DocumentRoot, or add the following line to httpd.conf:
-
-       Include ${PKG_SYSCONFDIR}/${AG}.conf
-
-For more configuration information, see the following files:
-
-       ${AG_DOCDIR}/INSTALL
-       ${AG_DOCDIR}/README
-       ${AG_DOCDIR}/UPGRADE
-
-===========================================================================
diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/Makefile
--- a/www/p5-Apache-Gallery/Makefile    Sun Mar 18 09:05:06 2018 +0000
+++ b/www/p5-Apache-Gallery/Makefile    Sun Mar 18 09:14:19 2018 +0000
@@ -1,99 +1,39 @@
-# $NetBSD: Makefile,v 1.69 2017/06/05 14:25:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2018/03/18 09:14:19 wiz Exp $
 
-DISTNAME=      Apache-Gallery-0.9.1
-PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   30
-CATEGORIES=    www graphics perl5
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Apache/}
+DISTNAME=      Apache-Gallery-1.0.2-withoutworldwriteables
+PKGNAME=       ${DISTNAME:C/-without.*//}
+CATEGORIES=    graphics www
+MASTER_SITES=  https://cpan.metacpan.org/authors/id/L/LE/LEGART/
 
 MAINTAINER=    kim%tac.nyc.ny.us@localhost
 HOMEPAGE=      http://apachegallery.dk/
 COMMENT=       Perl5/Apache module for handling image directories
 LICENSE=       artistic
 
-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>=1.15:../../graphics/p5-Image-Info
+DEPENDS+=      p5-Image-Info-[0-9]*:../../graphics/p5-Image-Info
 DEPENDS+=      p5-Image-Size-[0-9]*:../../graphics/p5-Image-Size
 DEPENDS+=      p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
-DEPENDS+=      p5-${APACHE_PKG_PREFIX}-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ}
-
-PERL5_PACKLIST=                auto/Apache/Gallery/.packlist
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?=    httpd
-MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-LIBAPREQ=              p5-libapreq2
-
-AG=                    ag
-AG_DOCDIR=             ${PREFIX}/share/doc/${AG}
-AG_EGDIR=              ${PREFIX}/share/examples/${AG}
-AG_SHAREDIR=           ${PREFIX}/share/${AG}
-
-FILES_SUBST+=          LDFLAGS=${LDFLAGS:M*:Q}
+DEPENDS+=      p5-HTTP-Date-[0-9]*:../../www/p5-HTTP-Date
+DEPENDS+=      p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=      p5-CGI-[0-9]*:../../www/p5-CGI
 
-MESSAGE_SUBST+=                AG=${AG}
-MESSAGE_SUBST+=                AG_DOCDIR=${AG_DOCDIR}
-MESSAGE_SUBST+=                AG_SHAREDIR=${AG_SHAREDIR}
-
-PLIST_SUBST+=          AG=${AG:Q}
-PLIST_SUBST+=          AG_DOCDIR=${AG_DOCDIR:S,${PREFIX}/,,}
-PLIST_SUBST+=          AG_EGDIR=${AG_EGDIR:S,${PREFIX}/,,}
-PLIST_SUBST+=          AG_SHAREDIR=${AG_SHAREDIR:S,${PREFIX}/,,}
-
-CONF_FILES=            ${AG_EGDIR}/${AG}.conf ${PKG_SYSCONFDIR}/${AG}.conf
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
-SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     ag.conf
-SUBST_SED.paths+=      -e 's,@AG@,${AG},g'
-SUBST_SED.paths+=      -e 's,@AG_SHAREDIR@,${AG_SHAREDIR},g'
-SUBST_STAGE.paths=     post-patch
+USE_LANGUAGES= # none
 
-USE_TOOLS+=    pax
-
-post-extract:
-       ${CP} ${FILESDIR}/ag.conf ${WRKSRC}
+TEST_ENV+=     MOD_PERL_API_VERSION=2
+BUILD_DEFS+=   VARBASE
 
-post-patch:
-       @${MV} -f ${WRKSRC}/templates/default/gallery.css \
-           ${WRKSRC}/htdocs/gallery-default.css
-       @${MV} -f ${WRKSRC}/templates/new/gallery.css \
-           ${WRKSRC}/htdocs/gallery-new.css
-
-pre-configure:
-       ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
+PERL5_PACKLIST=        auto/Apache/Gallery/.packlist
 
-post-build:
-       @for j in default new; \
-       do \
-           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
+SUBST_CLASSES+=                var
+SUBST_FILES.var+=      t/004_cache_dir.t
+SUBST_SED.var+=                -e 's,/var/tmp/Apache-Gallery,${VARBASE}/cache/www,'
+SUBST_STAGE.var=       pre-configure
 
-INSTALLATION_DIRS=     ${AG_SHAREDIR}/htdocs ${AG_SHAREDIR}/templates \
-                       ${AG_DOCDIR} ${AG_EGDIR}
-
-post-install:
-       cd ${WRKSRC}/htdocs && pax -rw . ${DESTDIR}${AG_SHAREDIR}/htdocs
-       cd ${WRKSRC}/templates && pax -rw . ${DESTDIR}${AG_SHAREDIR}/templates
-       ${INSTALL_DATA} ${WRKSRC}/Changes ${DESTDIR}${AG_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${AG_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${AG_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${AG_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DESTDIR}${AG_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/${AG}.conf ${DESTDIR}${AG_EGDIR}
-
-.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
-.include "../../mk/apache.mk"
+# for make test
+# (still asking for Apache::FakeRequest)
+.include "../../www/ap2-perl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/PLIST
--- a/www/p5-Apache-Gallery/PLIST       Sun Mar 18 09:05:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:00:30 joerg Exp $
-${AG_SHAREDIR}/htdocs/agfolder.png
-${AG_SHAREDIR}/htdocs/application-doc.png
-${AG_SHAREDIR}/htdocs/application-pdf.png
-${AG_SHAREDIR}/htdocs/application-rtf.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
-${AG_SHAREDIR}/htdocs/video-mpeg.png
-${AG_SHAREDIR}/htdocs/video-mpg.png
-${AG_SHAREDIR}/htdocs/video-wmv.png
-${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
-${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
-${AG_DOCDIR}/Changes
-${AG_DOCDIR}/INSTALL
-${AG_DOCDIR}/LICENSE
-${AG_DOCDIR}/README
-${AG_DOCDIR}/UPGRADE
-${AG_EGDIR}/${AG}.conf
diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/distinfo
--- a/www/p5-Apache-Gallery/distinfo    Sun Mar 18 09:05:06 2018 +0000
+++ b/www/p5-Apache-Gallery/distinfo    Sun Mar 18 09:14:19 2018 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 02:47:00 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/03/18 09:14:19 wiz Exp $
 
-SHA1 (Apache-Gallery-0.9.1.tar.gz) = e818c89d2b9a6d1aa63bacf149c4a259e6323284
-RMD160 (Apache-Gallery-0.9.1.tar.gz) = 015f9921520c5c3fe382b5e3b7d358b96ddd4be7
-SHA512 (Apache-Gallery-0.9.1.tar.gz) = 32d64f99d98cb970919422b4521d885c5e46ded6531acf4b45fae9979731dfa2d4b9352bddf3297edc4aacbbd8b06db5cb9229bdcf5616b955a55353e2f45f89
-Size (Apache-Gallery-0.9.1.tar.gz) = 82230 bytes
-SHA1 (patch-aa) = ba3246c428255c752fe2a3877072cf4de0f6c86d
+SHA1 (Apache-Gallery-1.0.2-withoutworldwriteables.tar.gz) = b68df2ac7bb784d1627e0b7e71460f8e4ae1a4e9
+RMD160 (Apache-Gallery-1.0.2-withoutworldwriteables.tar.gz) = 59e5c07ff536255e3defe0785908bb8621c2de09
+Size (Apache-Gallery-1.0.2-withoutworldwriteables.tar.gz) = 89317 bytes
diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/files/ag.conf
--- a/www/p5-Apache-Gallery/files/ag.conf       Sun Mar 18 09:05:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: ag.conf,v 1.3 2003/09/21 16:21:16 kim Exp $
-#
-# Configuration fragment for Apache::Gallery
-#
-
-#
-# Default settings
-#
-
-PerlSetVar GalleryTemplateDir @AG_SHAREDIR@/templates/default
-
-#
-# Files referred by default templates
-#
-
-<IfModule mod_alias.c>
-    Alias /@AG@/ "@AG_SHAREDIR@/htdocs/"
-</IfModule>
-
-<Directory "@AG_SHAREDIR@/htdocs">
-    Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
diff -r 89bf233c08d8 -r 5414315a236d www/p5-Apache-Gallery/patches/patch-aa
--- a/www/p5-Apache-Gallery/patches/patch-aa    Sun Mar 18 09:05:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/04/16 14:19:25 kim Exp $
-
---- lib/Apache/Gallery.pm.orig 2004-09-12 00:53:05.000000000 +0300
-+++ lib/Apache/Gallery.pm      2006-04-16 16:43:43.000000000 +0300
-@@ -13,22 +13,22 @@
- 
-       eval('require mod_perl;');
-       if ( $@ ) {
--              require Apache2::mod_perl;
-+              require mod_perl2;
-       }
- 
-       $::MP2 = ($mod_perl::VERSION >= 1.99);
-       
-       if ($::MP2) {
--              require Apache2;
--              require Apache::Server;
--              require Apache::RequestRec;
--              require Apache::Log;
-+              #require Apache2;
-+              #require Apache2::Server;
-+              require Apache2::RequestRec;
-+              require Apache2::Log;
-               require APR::Table;
--              require Apache::RequestIO;
--              require Apache::SubRequest;
--              require Apache::Const;
-+              require Apache2::RequestIO;
-+              require Apache2::SubRequest;
-+              require Apache2::Const;
-       



Home | Main Index | Thread Index | Old Index