From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 4 22:00:27 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1E2916A42B for ; Sat, 4 Feb 2006 22:00:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6B1C43D5C for ; Sat, 4 Feb 2006 22:00:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k14M0Hbc051760 for ; Sat, 4 Feb 2006 22:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k14M0HcT051759; Sat, 4 Feb 2006 22:00:17 GMT (envelope-from gnats) Resent-Date: Sat, 4 Feb 2006 22:00:17 GMT Resent-Message-Id: <200602042200.k14M0HcT051759@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, Alex Varju Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EF4D16A420 for ; Sat, 4 Feb 2006 21:54:26 +0000 (GMT) (envelope-from Alex.Varju@webct.com) Received: from asterix.webct.com (asterix.webct.com [209.87.17.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2E3643D60 for ; Sat, 4 Feb 2006 21:54:23 +0000 (GMT) (envelope-from Alex.Varju@webct.com) Received: from snapple.webct.com ([10.1.0.45]) by asterix.webct.com over TLS secured channel with Microsoft SMTPSVC(5.0.2195.6713); Sat, 4 Feb 2006 13:54:22 -0800 Received: from snapple.webct.com (localhost [127.0.0.1]) by snapple.webct.com (8.13.1/8.13.1) with ESMTP id k14LsGTU016273 for ; Sat, 4 Feb 2006 13:54:16 -0800 (PST) (envelope-from varju@snapple.webct.com) Received: (from root@localhost) by snapple.webct.com (8.13.1/8.13.1/Submit) id k14LsGwP016272; Sat, 4 Feb 2006 13:54:16 -0800 (PST) (envelope-from varju) Message-Id: <200602042154.k14LsGwP016272@snapple.webct.com> Date: Sat, 4 Feb 2006 13:54:16 -0800 (PST) From: Alex Varju To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92825: [MAINTAINER] www/gallery2: [SUMMARIZE CHANGES] 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: Sat, 04 Feb 2006 22:00:27 -0000 >Number: 92825 >Category: ports >Synopsis: [MAINTAINER] www/gallery2: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Feb 04 22:00:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alex Varju >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD snapple.webct.com 5.3-STABLE FreeBSD 5.3-STABLE #13: Wed Nov 3 11:31:28 PST >Description: - Fix pkg-plist error - Allow PostgreSQL to be used instead of MySQL (based on a patch sent to me by Brian.Johnson at stellent.com) - Add missing php-gd dependency when WITH_GD is specified Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- gallery2-2.0.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/freebsd/cvsroot/ports/www/gallery2/Makefile,v retrieving revision 1.43 diff -u -u -r1.43 Makefile --- Makefile 1 Dec 2005 08:28:25 -0000 1.43 +++ Makefile 4 Feb 2006 21:51:26 -0000 @@ -16,7 +16,7 @@ MAINTAINER= freebsd-ports@varju.ca COMMENT= Gallery is a web based photo album written using PHP -USE_PHP= pcre session mysql +USE_PHP= pcre session WANT_PHP_WEB= yes WRKSRC= ${WRKDIR}/${DIST_SUBDIR} @@ -29,29 +29,39 @@ WWWOWN?= www WWWGRP?= www -OPTIONS= NETPBM "Enable netpbm support" on \ - IMAGEMAGICK "Enable imagemagick support" on \ - JHEAD "Enable jhead support" on \ - UNZIP "Enable unzip support" on \ - GD "Enable gd support" off \ - DCRAW "Enable dcraw support" off \ - FFMPEG "Enable ffmpeg support" off +# Note that USE_PHP must be set before bsd.port.pre.mk is included, so +# OPTIONS can't be used right now without making portlint angry +#OPTIONS= NETPBM "Enable netpbm support" on \ +# IMAGEMAGICK "Enable imagemagick support" on \ +# PGSQL "Use PostgreSQL instead of MySQL" off \ +# JHEAD "Enable jhead support" on \ +# UNZIP "Enable unzip support" on \ +# GD "Enable gd support" off \ +# DCRAW "Enable dcraw support" off \ +# FFMPEG "Enable ffmpeg support" off + +.if defined(WITH_PGSQL) +USE_PHP+= pgsql +.else +USE_PHP+= mysql +.endif +.if defined(WITH_GD) +USE_PHP+= gd +RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd +.endif .include -.if defined(WITH_NETPBM) +.if !defined(WITHOUT_NETPBM) RUN_DEPENDS+= giftopnm:${PORTSDIR}/graphics/netpbm .endif -.if defined(WITH_IMAGEMAGICK) +.if !defined(WITHOUT_IMAGEMAGICK) RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif -.if defined(WITH_GD) -RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd -.endif -.if defined(WITH_JHEAD) +.if !defined(WITHOUT_JHEAD) RUN_DEPENDS+= jhead:${PORTSDIR}/graphics/jhead .endif -.if defined(WITH_UNZIP) +.if !defined(WITHOUT_UNZIP) RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif .if defined(WITH_FFMPEG) Index: pkg-plist =================================================================== RCS file: /home/freebsd/cvsroot/ports/www/gallery2/pkg-plist,v retrieving revision 1.29 diff -u -u -r1.29 pkg-plist --- pkg-plist 22 Jan 2006 02:57:31 -0000 1.29 +++ pkg-plist 4 Feb 2006 21:51:29 -0000 @@ -5624,7 +5624,7 @@ @dirrm %%GALLERY2DIR%%/install/locale/bg_BG @dirrm %%GALLERY2DIR%%/install/locale @dirrm %%GALLERY2DIR%%/install/images -@dirrmtry %%GALLERYDIR%%/install +@dirrmtry %%GALLERY2DIR%%/install @dirrm %%GALLERY2DIR%%/images @dirrm %%GALLERY2DIR%%/docs -@dirrmtry %%GALLERYDIR%% +@dirrmtry %%GALLERY2DIR%% --- gallery2-2.0.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: