ports/133690: [PATCH] www/p5-Apache-Gallery: apache@ cleanups
Philip M. Gollucci
pgollucci at FreeBSD.org
Mon Apr 13 05:20:01 UTC 2009
>Number: 133690
>Category: ports
>Synopsis: [PATCH] www/p5-Apache-Gallery: apache@ cleanups
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 13 05:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 7.1-RELEASE-p3 amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD mail.bluecottontech.com 7.1-RELEASE-p3 FreeBSD 7.1-RELEASE-p3 #1: Tue Mar 10 22:10:18 UTC 2009
>Description:
- APACHE_COMPAT is deprecated
- Consolidate (BUILD|RUN)_DEPENDS
- Kill DEPENDS_ARGS not needed anymore
- Use SUB_FILES for pkg-message
- pkg-plist fix
- Bump PORTREVISION
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Port maintainer (brix at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- p5-Apache-Gallery-1.0.r3_1,2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-Gallery/Makefile,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile
--- Makefile 16 Jan 2009 23:20:17 -0000 1.27
+++ Makefile 13 Apr 2009 05:15:59 -0000
@@ -7,6 +7,7 @@
PORTNAME= Apache-Gallery
PORTVERSION= 1.0.r3
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www perl5
MASTER_SITES= http://apachegallery.dk/download/ \
@@ -17,8 +18,7 @@
MAINTAINER= brix at FreeBSD.org
COMMENT= Apache::Gallery - mod_perl handler to create an image gallery
-BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \
- ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
+BUILD_DEPENDS= ${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}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
@@ -27,21 +27,18 @@
RUN_DEPENDS= ${BUILD_DEPENDS}
.if defined(WITH_APACHE2)
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
-DEPENDS_ARGS+= WITHOUT_MODPERL=yes
-DEPENDS_ARGS+= WITH_MODPERL2=yes
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
.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
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
.endif
PERL_CONFIGURE= yes
-APACHE_COMPAT= yes
MAN3= Apache::Gallery.3
DOC_FILES= INSTALL LICENSE README TODO UPGRADE
+SUB_FILES+= pkg-message
+
post-install:
@${MKDIR} ${PREFIX}/www/icons/gallery/
${INSTALL_DATA} ${WRKSRC}/htdocs/* \
@@ -54,14 +51,14 @@
${DATADIR}/templates/new/
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}/
.for file in ${DOC_FILES}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/
.endfor
.endif
.if !defined(BATCH)
- @${SED} s!%%DATADIR%%!${DATADIR}!g ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.endif
.include <bsd.port.pre.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 19 Jul 2005 20:39:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
----------------------------------------------------------------------------------------
-
-<VirtualHost 123.123.123.123>
- ServerName gallery.yourdomain.org
- DocumentRoot /data/pictures/
- ErrorLog logs/gallery-error_log
- TransferLog logs/gallery-access_log
- PerlSetVar GalleryTemplateDir '%%DATADIR%%/templates/default'
- PerlSetVar GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash'
- PerlSetVar GallerySizes '640 1024 1600 2272'
- PerlSetVar GalleryThumbnailSize '100x75'
- PerlSetVar GalleryCacheDir '/var/tmp/Apache-Gallery/'
- <Location />
- SetHandler perl-script
- PerlHandler Apache::Gallery
- </Location>
-</VirtualHost>
-
-And copy %%DATADIR%%/templates/default/gallery.css to your DocumentRoot
-
----------------------------------------------------------------------------------------
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-Gallery/pkg-plist,v
retrieving revision 1.8
diff -u -u -r1.8 pkg-plist
--- pkg-plist 26 Nov 2008 20:03:02 -0000 1.8
+++ pkg-plist 13 Apr 2009 05:15:59 -0000
@@ -64,6 +64,7 @@
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrmtry %%SITE_PERL%%/Apache
@dirrm %%DATADIR%%/templates/default
@dirrm %%DATADIR%%/templates/new
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 13 Apr 2009 05:15:59 -0000
@@ -0,0 +1,21 @@
+---------------------------------------------------------------------------------------
+
+<VirtualHost 123.123.123.123>
+ ServerName gallery.yourdomain.org
+ DocumentRoot /data/pictures/
+ ErrorLog logs/gallery-error_log
+ TransferLog logs/gallery-access_log
+ PerlSetVar GalleryTemplateDir '%%DATADIR%%/templates/default'
+ PerlSetVar GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash'
+ PerlSetVar GallerySizes '640 1024 1600 2272'
+ PerlSetVar GalleryThumbnailSize '100x75'
+ PerlSetVar GalleryCacheDir '/var/tmp/Apache-Gallery/'
+ <Location />
+ SetHandler perl-script
+ PerlHandler Apache::Gallery
+ </Location>
+</VirtualHost>
+
+And copy %%DATADIR%%/templates/default/gallery.css to your DocumentRoot
+
+---------------------------------------------------------------------------------------
--- p5-Apache-Gallery-1.0.r3_1,2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list