From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 1 01:50:15 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E403116A40F for ; Fri, 1 Dec 2006 01:50:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D13B43C9D for ; Fri, 1 Dec 2006 01:50:03 +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 kB11oExZ069401 for ; Fri, 1 Dec 2006 01:50:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB11oDtG069400; Fri, 1 Dec 2006 01:50:13 GMT (envelope-from gnats) Resent-Date: Fri, 1 Dec 2006 01:50:13 GMT Resent-Message-Id: <200612010150.kB11oDtG069400@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, Nick Barkas Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 302D216A407 for ; Fri, 1 Dec 2006 01:44:33 +0000 (UTC) (envelope-from snb@moduli.net) Received: from maguro.moduli.net (maguro.moduli.net [69.80.211.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id DED2543CAC for ; Fri, 1 Dec 2006 01:44:21 +0000 (GMT) (envelope-from snb@moduli.net) Received: by maguro.moduli.net (Postfix, from userid 1001) id 4B51517042; Thu, 30 Nov 2006 17:47:15 -0800 (PST) Message-Id: <20061201014715.4B51517042@maguro.moduli.net> Date: Thu, 30 Nov 2006 17:47:15 -0800 (PST) From: Nick Barkas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106103: [patch] misc/tinderbox port requires php X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Nick Barkas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2006 01:50:15 -0000 >Number: 106103 >Category: ports >Synopsis: [patch] misc/tinderbox port requires php >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Dec 01 01:50:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Nick Barkas >Release: FreeBSD 6.1-SECURITY i386 >Organization: Three Rings Design >Environment: System: FreeBSD maguro.moduli.net 6.1-SECURITY FreeBSD 6.1-SECURITY #0: Mon Aug 28 05:21:08 UTC 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: The misc/tinderbox port tries to install PHP and Pear as dependencies if you do not have them already, even if you do not wish to use the web parts of tinderbox. Attached is a patch to the port's Makefile which adds a new option for whether to use the web interface or not, and if not the PHP/Pear dependencies are no longer required. >How-To-Repeat: make install in /usr/ports/misc/tinderbox with PHP and/or Pear not installed already. >Fix: --- Makefile.orig Thu Nov 30 11:44:30 2006 +++ Makefile Thu Nov 30 11:53:16 2006 @@ -12,12 +12,11 @@ MAINTAINER= itetcu@FreeBSD.org COMMENT= Port build tinderbox system -RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB - OPTIONS= PGSQL "With pgsql" Off \ MYSQL "With mysql" On \ CSUP "Use csup for updates" On \ CVSUP "Use cvsup for updates" Off \ + WEB "Install web interface" On \ APACHE "Use Apache for web interface" On \ LIGHTTPD "Use LightHTTPD for web interface" Off @@ -34,17 +33,24 @@ IGNORE= is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL .endif +.if !defined(WITHOUT_WEB) +RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB WANT_PHP_WEB= yes USE_PHP= session +.endif .if defined(WITH_PGSQL) USE_PGSQL= yes +.if !defined(WITHOUT_WEB) USE_PHP+= pgsql +.endif RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg .endif .if !defined(WITHOUT_MYSQL) +.if !defined(WITHOUT_WEB) USE_PHP+= mysql +.endif USE_MYSQL= yes IGNORE_WITH_MYSQL= 323 40 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER:S/323//} @@ -66,7 +72,9 @@ RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .endif +.if !defined(WITHOUT_WEB) .include "${PORTSDIR}/Mk/bsd.php.mk" +.endif #post-extract: >Release-Note: >Audit-Trail: >Unformatted: