From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 13 05:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51C5D1065674 for ; Mon, 13 Apr 2009 05:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 288768FC1B for ; Mon, 13 Apr 2009 05:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3D5K126071419 for ; Mon, 13 Apr 2009 05:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3D5K199071418; Mon, 13 Apr 2009 05:20:01 GMT (envelope-from gnats) Resent-Date: Mon, 13 Apr 2009 05:20:01 GMT Resent-Message-Id: <200904130520.n3D5K199071418@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1FDE106566C; Mon, 13 Apr 2009 05:19:49 +0000 (UTC) (envelope-from pgollucci@mail.bluecottontech.com) Received: from mail.bluecottontech.com (static-76-161-175-34.dsl.cavtel.net [76.161.175.34]) by mx1.freebsd.org (Postfix) with ESMTP id 62EC18FC08; Mon, 13 Apr 2009 05:19:49 +0000 (UTC) (envelope-from pgollucci@mail.bluecottontech.com) Received: from mail.bluecottontech.com (localhost [127.0.0.1]) by mail.bluecottontech.com (8.14.3/8.14.3) with ESMTP id n3D5JmTL049612; Mon, 13 Apr 2009 05:19:48 GMT (envelope-from pgollucci@mail.bluecottontech.com) Received: (from pgollucci@localhost) by mail.bluecottontech.com (8.14.3/8.14.3/Submit) id n3D5JhNw049611; Mon, 13 Apr 2009 05:19:43 GMT (envelope-from pgollucci) Message-Id: <200904130519.n3D5JhNw049611@mail.bluecottontech.com> Date: Mon, 13 Apr 2009 05:19:43 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: brix@FreeBSD.org Subject: ports/133690: [PATCH] www/p5-Apache-Gallery: apache@ cleanups X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2009 05:20:01 -0000 >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@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@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 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 @@ ---------------------------------------------------------------------------------------- - - - 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/' - - SetHandler perl-script - PerlHandler Apache::Gallery - - - -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 +@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 @@ +--------------------------------------------------------------------------------------- + + + 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/' + + SetHandler perl-script + PerlHandler Apache::Gallery + + + +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: