From snb@moduli.net  Fri Dec  1 01:44:33 2006
Return-Path: <snb@moduli.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 302D216A407
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <snb@threerings.net>
Reply-To: Nick Barkas <snb@threerings.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] misc/tinderbox port requires php
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         106103
>Category:       ports
>Synopsis:       [patch] misc/tinderbox port requires php
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 01 01:50:12 GMT 2006
>Closed-Date:    Fri Dec 01 14:12:24 GMT 2006
>Last-Modified:  Fri Dec 01 14:12:24 GMT 2006
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Dec 1 01:50:27 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106103 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106103: commit references a PR
Date: Fri,  1 Dec 2006 13:57:56 +0000 (UTC)

 itetcu      2006-12-01 13:57:48 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/tinderbox       Makefile pkg-plist 
   Log:
   - install of www and www-exp conditionally (on WEB and WEB_EXP OPTIONS)
   - don't depend on php if neither web interface is intalled [1]
   - bump PORTREVISON for plist changes.
   
   PR:             ports/106103 [1] (inspired by)
   Submitted by:   Nick Barkas [1]
   
   Revision  Changes    Path
   1.24      +41 -5     ports/misc/tinderbox/Makefile
   1.9       +53 -53    ports/misc/tinderbox/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Fri Dec 1 14:12:20 UTC 2006 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106103 
>Unformatted:
