ports/74511:

[Kenneth Vestergaard Schmidt]

>Number:         74511
>Category:       ports
>Synopsis:       
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 29 12:30:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kenneth Vestergaard Schmidt
>Release:        FreeBSD 5.3-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hoegaarden.pil.dk 5.3-RELEASE-p1 FreeBSD 5.3-RELEASE-p1 #0: Wed Nov 24 10:06:29 CET 2004 kvs at hoegaarden.pil.dk:/usr/obj/usr/src/sys/HOEGAARDEN i386


>Description:
	Update of www/p5-Apache-Gallery to latest version.

--- update-0.9.1.diff begins here ---
diff -ur /usr/ports/www/p5-Apache-Gallery/Makefile p5-Apache-Gallery/Makefile
--- /usr/ports/www/p5-Apache-Gallery/Makefile	Wed Sep 24 10:45:08 2003
+++ p5-Apache-Gallery/Makefile	Mon Nov 29 11:26:58 2004
@@ -6,26 +6,39 @@
 #
 
 PORTNAME=	Apache-Gallery
-PORTVERSION=	0.7
+PORTVERSION=	0.9.1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
+PERL_CONFIGURE=	yes
+
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Apache::Gallery - mod_perl handler to create an image gallery
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
+		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
-		${SITE_PERL}/CGI/FastTemplate.pm:${PORTSDIR}/www/p5-CGI-FastTemplate \
 		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
 		${SITE_PERL}/${PERL_ARCH}/Image/Imlib2.pm:${PORTSDIR}/graphics/p5-Image-Imlib2 \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
+
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+.if defined(WITH_APACHE2)
+BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
+DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
+DEPENDS_ARGS+=	WITH_MODPERL2=yes
+.else
+# XXX - probe for static mod_perl using `httpd -l | grep perl`
+BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
+.endif
+.endif
+
 PERL_CONFIGURE=	yes
 
 MAN3=		Apache::Gallery.3
@@ -42,9 +55,6 @@
 		video-mov.png video-mpeg.png video-mpg.png video-wmv.png \
 		video-asf.png agfolder.png
 
-post-configure:
-	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' pkg-message > ${PKGMESSAGE}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/Apache-Gallery/templates
@@ -61,7 +71,7 @@
 		${PREFIX}/share/Apache-Gallery/css/
 .endif
 .if !defined(BATCH)
-	@ ${CAT} ${PKGMESSAGE}
+	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.pre.mk>
diff -ur /usr/ports/www/p5-Apache-Gallery/distinfo p5-Apache-Gallery/distinfo
--- /usr/ports/www/p5-Apache-Gallery/distinfo	Tue Mar  2 15:15:35 2004
+++ p5-Apache-Gallery/distinfo	Mon Nov 29 11:11:27 2004
@@ -1,2 +1,2 @@
-MD5 (Apache-Gallery-0.7.tar.gz) = ff79dedab956105456e6c70d495f6a72
-SIZE (Apache-Gallery-0.7.tar.gz) = 73532
+MD5 (Apache-Gallery-0.9.1.tar.gz) = 882e650e6fc3f059e84eca1564b5f32f
+SIZE (Apache-Gallery-0.7.tar.gz) = 82230
Only in p5-Apache-Gallery/files: patch-Server.pm
diff -ur /usr/ports/www/p5-Apache-Gallery/pkg-plist p5-Apache-Gallery/pkg-plist
--- /usr/ports/www/p5-Apache-Gallery/pkg-plist	Wed Sep 24 10:45:08 2003
+++ p5-Apache-Gallery/pkg-plist	Mon Nov 29 11:28:34 2004
@@ -24,11 +24,11 @@
 share/Apache-Gallery/css/gallery.css
 www/icons/agfolder.png
 www/icons/application-doc.png
-www/icons/application-mp3.png
-www/icons/application-ogg.png
 www/icons/application-pdf.png
 www/icons/application-rtf.png
-www/icons/application-wav.png
+www/icons/sound-mp3.png
+www/icons/sound-ogg.png
+www/icons/sound-wav.png
 www/icons/video-asf.png
 www/icons/video-avi.png
 www/icons/video-mov.png
--- update-0.9.1.diff ends here ---
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
 Synopsis:	[patch] update of www/p5-Apache-Gallery to 0.9.1
 Priority:	low