summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/p5-Apache-Gallery/Makefile8
-rw-r--r--www/p5-Apache-Gallery/PLIST21
-rw-r--r--www/p5-Apache-Gallery/distinfo8
-rw-r--r--www/p5-Apache-Gallery/files/ag.conf3
-rw-r--r--www/p5-Apache-Gallery/patches/patch-aa21
5 files changed, 38 insertions, 23 deletions
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 8dd2f16384d..c1d4af74d14 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/22 04:14:27 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/06 03:52:07 kim Exp $
#
-DISTNAME= Apache-Gallery-0.4.1
+DISTNAME= Apache-Gallery-0.6
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
SVR4_PKGNAME= p5aga
CATEGORIES= www graphics
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -36,6 +35,7 @@ AG_SHAREDIR= ${PREFIX}/share/${AG}
FILES_SUBST+= AG=${AG}
FILES_SUBST+= AG_SHAREDIR=${AG_SHAREDIR}
+FILES_SUBST+= LDFLAGS=${LDFLAGS:Q}
MESSAGE_SUBST+= AG=${AG}
MESSAGE_SUBST+= AG_DOCDIR=${AG_DOCDIR}
@@ -49,7 +49,7 @@ 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
diff --git a/www/p5-Apache-Gallery/PLIST b/www/p5-Apache-Gallery/PLIST
index 58a63ccf9b6..de8913d4b96 100644
--- a/www/p5-Apache-Gallery/PLIST
+++ b/www/p5-Apache-Gallery/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/01 22:42:49 kim Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/06 03:52:07 kim Exp $
+${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/video-asf.png
@@ -6,18 +12,29 @@ ${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
@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/movie.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
@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 28cf8c62783..db72398ab9e 100644
--- a/www/p5-Apache-Gallery/distinfo
+++ b/www/p5-Apache-Gallery/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/01 22:42:49 kim Exp $
+$NetBSD: distinfo,v 1.2 2003/09/06 03:52:07 kim Exp $
-SHA1 (Apache-Gallery-0.4.1.tar.gz) = 1e499a3e9832665f0097f1f2687b7fd97d961c39
-Size (Apache-Gallery-0.4.1.tar.gz) = 37385 bytes
-SHA1 (patch-aa) = 7225905020e9799fae44fd16f26efedc35e0a049
+SHA1 (Apache-Gallery-0.6.tar.gz) = de66cfe0698e28124b2c014eec34e6043f99d14f
+Size (Apache-Gallery-0.6.tar.gz) = 66429 bytes
+SHA1 (patch-aa) = 2861bf08ee146ba660dc83fa6fe0c3a3c1506c55
diff --git a/www/p5-Apache-Gallery/files/ag.conf b/www/p5-Apache-Gallery/files/ag.conf
index 7740755c08d..7ff8f57a108 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.1.1.1 2002/09/01 22:42:49 kim Exp $
+# $NetBSD: ag.conf,v 1.2 2003/09/06 03:52:08 kim Exp $
#
# Configuration fragment for Apache::Gallery
#
@@ -7,7 +7,6 @@
# Default settings
#
-PerlSetVar InlineDir /tmp
PerlSetVar GalleryTemplateDir @AG_SHAREDIR@/templates
#
diff --git a/www/p5-Apache-Gallery/patches/patch-aa b/www/p5-Apache-Gallery/patches/patch-aa
index e8e41317d58..982b5c981e7 100644
--- a/www/p5-Apache-Gallery/patches/patch-aa
+++ b/www/p5-Apache-Gallery/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/01 22:42:49 kim Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/06 03:52:08 kim Exp $
---- lib/Apache/Gallery.pm.orig Sun Aug 11 11:40:26 2002
-+++ lib/Apache/Gallery.pm Sun Sep 1 17:51:34 2002
-@@ -23,9 +23,9 @@
+--- 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 =>
+ use Inline (C => Config =>
- LIBS => '-L/usr/X11R6/lib -lImlib2 -lm -ldl -lXext -lXext',
-+ LIBS => '-lImlib2',
- DIRECTORY => Apache->request()->dir_config('InlineDir') ? Apache->request()->dir_config('InlineDir') : "/tmp/",
- INC => '-I/usr/X11R6/include',
-+ INC => '-I@X11BASE@/include',
- ENABLE => 'UNTAINT';
-
- use Inline 'C';
++ LIBS => '-lImlib2',
++ INC => '-I@LOCALBASE@/include -I@X11BASE@/include',
+ UNTAINT => 1,
+ DIRECTORY => File::Spec->tmpdir()
+ );