Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Nov 2006 22:08:47 -0000
From:      Shaun Amott <shaun@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/105259: misc/tinderbox: Make Apache dependency optional
Message-ID:  <1162937327.4506@charon.picobyte.net>
Resent-Message-ID: <200611072210.kA7MASER019487@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         105259
>Category:       ports
>Synopsis:       misc/tinderbox: Make Apache dependency optional
>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:   Tue Nov 07 22:10:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Shaun Amott
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:

>Description:

Tinderbox doesn't need a web server. Furthermore, the web portion works
perfectly well with !Apache. Therefore, the dependency should be
optional. The patch below adds an additional knob for Lighttpd, possibly
the next most popular web server after Apache.

>How-To-Repeat:

>Fix:

--- tinderbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/tinderbox/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	14 Oct 2006 21:02:49 -0000	1.21
+++ Makefile	7 Nov 2006 22:05:29 -0000
@@ -21,13 +21,18 @@
 		CVSUP "Use cvsup for updates" Off
 
 NO_BUILD=	yes
-USE_APACHE=	1.3+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 		tc-configJail.1 tc-configTinderd.1 tc-init.1
 
+.if defined(WITH_APACHE)
+USE_APACHE=	1.3+
+.elif defined(WITH_LIGHTTPD)
+RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_PGSQL) && defined(WITHOUT_MYSQL)
--- tinderbox.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1162937327.4506>