- port support for Hiawatha web server from ports-mgmt/tinderbox

- reorder pkg-message a bit to make it more clear and fix some typos

Feature safe:	yes

2 files changed, 24 insertions, 20 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 14717ac93c3..5f19f5eba78 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -22,6 +22,7 @@ OPTIONS=	PGSQL "With pgsql" Off \
 		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 \
@@ -84,6 +85,8 @@ RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 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)
@@ -99,8 +102,8 @@ EXTRA_PATCHES+=		${FILESDIR}/extra-parallel.patch
 .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, Hiawatha or LightHTTPD if not using the WebUI."
 	@${FALSE}
 .endif
 
diff --git a/ports-mgmt/tinderbox-devel/files/pkg-message.in b/ports-mgmt/tinderbox-devel/files/pkg-message.in
index 7afbe785c52..5fe44212032 100644
--- a/ports-mgmt/tinderbox-devel/files/pkg-message.in
+++ b/ports-mgmt/tinderbox-devel/files/pkg-message.in
@@ -6,7 +6,25 @@ ports-mgmt/tinderbox is now installed, but it requires some additional setup.
 Please do read: %%PREFIX%%/tinderbox/scripts/README
 ****************************************************
 
-The following walkthrough is the webserver setup:
+=============================================================================
+
+If you installed the port with WITH_TMPFS option:
+To enable the usage of FreeBSD's tmpfs implementation you need to add the
+tmpfs kernel module to your /boot/loader.conf:
+tmpfs_load="YES"
+
+If you installed the port WITH_PARALLEL option:
+The parallel patch allows to run multiple tinderd instances at the same time.
+You can enable multiple tinderd instances via /etc/rc.conf with:
+tinderd_instances="N"
+
+Both patches are experimental and are not official supported by the Tinderbox
+distribution.
+
+=============================================================================
+
+
+The following walkthrough is the webserver setup, if you installed the WebUI:
 
 - In your Apache configuration add the following lines:
 
@@ -33,20 +51,3 @@ dir-listing.activate = "enable"
 
 =============================================================================
 
-tmpfs options:
-To enable the usage of FreeBSD's tmpfs implementation
-you need to add the tmpfs kernel module to your
-loader.conf
-
-tmpfs_load="YES"
-
-parallels options:
-
-The parallel patch allows to run multiple tinderd instances at the same time.
-You can enable multiple tinderd instances via /etc/rc.conf with
-tinderd_instances="X"
-
-Both patches are experimental and are not official supported by the Tinderbox
-distribution.
-
-=============================================================================