Attachment 102311 Details for Bug 142090 – file.diff

[patch] file.diff

file.diff (text/plain), 2.48 KB, created by Chris Petrik on 2009-12-28 04:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2009-12-28 04:30:02 UTC

Size: 2.48 KB

patch

obsolete

>Index: tinderbox/Makefile
>===================================================================
>RCS file: /usr/ncvs/ports/ports-mgmt/tinderbox/Makefile,v
>retrieving revision 1.62
>diff -u -r1.62 Makefile
>--- tinderbox/Makefile	25 Dec 2009 20:29:24 -0000	1.62
>+++ tinderbox/Makefile	27 Dec 2009 03:39:19 -0000
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	tinderbox
> PORTVERSION=	3.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	ports-mgmt
> MASTER_SITES=	http://tinderbox.marcuscom.com/ \
> 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
>@@ -23,6 +23,7 @@
> 		CVSUP "Use cvsup for updates" Off \
> 		WEBUI   "Install web interface" On \
> 		APACHE "Use Apache for web interface" On \
>+		HIAWATHA "Use Hiawatha for web interface" Off \
> 		LIGHTTPD "Use LightHTTPD for web interface" Off \
> 		CHECK_FOR_ROOT "Check if ./tc is run by uid 0" On \
> 		LSOF "For killMountProcesses() when using nullfs" On
>@@ -83,6 +84,8 @@
> USE_APACHE=	1.3+
> .elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
> RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
>+.elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI)
>+RUN_DEPENDS+=	hiawatha:${PORTSDIR}/www/hiawatha
> .endif
> 
> .if defined(WITH_LSOF)
>@@ -90,8 +93,8 @@
> .endif
> 
> pre-everything::
>-.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !defined(WITH_WEBUI)
>-	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
>+.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD) || defined(WITH_HIAWATHA)) && !defined(WITH_WEBUI)
>+	@${ECHO_CMD} "It doesn't make sense to depend on Apache, LightHTTPD or Hiawatha if not using either web interface."
> 	@${FALSE}
> .endif
> 
>Index: tinderbox/files/pkg-message.in
>===================================================================
>RCS file: /usr/ncvs/ports/ports-mgmt/tinderbox/files/pkg-message.in,v
>retrieving revision 1.13
>diff -u -r1.13 pkg-message.in
>--- tinderbox/files/pkg-message.in	12 Nov 2008 15:58:29 -0000	1.13
>+++ tinderbox/files/pkg-message.in	27 Dec 2009 03:42:38 -0000
>@@ -29,6 +29,15 @@
> 		"/tb/" => "%%PREFIX%%/tinderbox/scripts/webui/" )
> dir-listing.activate = "enable"
> 
>+- In you Hiawatha configuration:
>+
>+Alias is a built in command, no need to load any special mod
>+
>+Alias = /tb/logs:%%PREFIX%%/tinderbox/logs
>+Alias = /tb/packages:%%PREFIX%%/tinderbox/packages
>+Alias = /tb/errors:%%PREFIX%%/tinderbox/errors
>+Alias = /tb/:%%PREFIX%%/tinderbox/scripts/webui
>+
>   Check your system by going to http://localhost/tb/
> 
> =============================================================================

Actions: View | Diff

Attachments on bug 142090: 102311