- Improve pkg-message

- Change dependency on net/cvsup-without-gui (itetcu@#bsdports)

4 files changed, 48 insertions, 24 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index cb5049958672..8b76ad4a16ea 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Port build tinderbox system
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
-		cvsup:${PORTSDIR}/net/cvsup
+		cvsup:${PORTSDIR}/net/cvsup-without-gui
 
 OPTIONS=	PGSQL "With pgsql" On \
 		MYSQL "With mysql" Off
diff --git a/ports-mgmt/tinderbox-devel/files/pkg-message.in b/ports-mgmt/tinderbox-devel/files/pkg-message.in
index 0cc18c1f3359..f45aad2edfc6 100644
--- a/ports-mgmt/tinderbox-devel/files/pkg-message.in
+++ b/ports-mgmt/tinderbox-devel/files/pkg-message.in
@@ -50,7 +50,6 @@ The following walkthrough is the tinderbox environment setup:
 The following walkthrough is the initial tinderbox population setup
 and should be executed in %%PREFIX%%/tinderbox/scripts.
 
-
 - Create a jail. A jail is a chrooted version of the FreeBSD operating
   system, for example 6.0-RELEASE or 5.4-RELEASE:
   ./create Jail -j 5.4 -d "FreeBSD 5.4-RELEASE" -t RELENG_5_4_0_RELEASE -u CVSUP
@@ -64,25 +63,38 @@ and should be executed in %%PREFIX%%/tinderbox/scripts.
 - And then link the two together in a build:
   ./create Build -b 5.4-FreeBSD -j 5.4 -p FreeBSD -d "5.4-RELEASE with FreeBSD ports tree"
 
-- Now the tinderbox is ready to be used. See the documents
-  %%PREFIX%%/tinderbox/scripts/README and the "Using Tinderbox"
-  section for more information.
-
 The following walkthrough is the webserver setup:
 
 - In your Apache configuration, add the following lines:
 
-  Alias /tb/ "/usr/local/tinderbox/scripts/www-exp"
-  <Directory "/usr/local/tinderbox/scripts/www-exp/">
+  Alias /tb/logs/ "/usr/local/tinderbox/logs/"
+  Alias /tb/packages/ "/usr/local/tinderbox/packages/"
+  Alias /tb/errors/ "/usr/local/tinderbox/errors/"
+  Alias /tb/ "/usr/local/tinderbox/scripts/www-exp/"
+  <Directory "/usr/local/tinderbox/">
       Order allow,deny
       Allow from all
   </Directory>
 
   Check your system by going to http://localhost/tb/
 
-- And now, the first port build!
+The following walkthrough is the first run for a port in the
+tinderbox and should be executed in %%PREFIX%%/tinderbox/scripts.
+
+- See the documents %%PREFIX%%/tinderbox/scripts/README and the
+  "Using Tinderbox" section for more information.
+
+- Add the port and its dependencies to the database:
+  ./tc addPort -b 5.4-FreeBSD -d net/dhcpdump -r
+
+- On the website you see now five ports on the build page.
+
+- Start the build:
+  ./tinderbuild -nullfs -b 5.4-FreeBSD dns/dnstracer
+
+- On the page "Current and latest builds in this build" you see the
+  current being-built port and the last n ports built.
 
-Now the tinderbox is ready to be used. See the documents
-%%PREFIX%%/tinderbox/scripts/README and the "Using Tinderbox" section
-for more information.
+- At a certain moment, when you refresh the page, you see that it
+  has changed.
 
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index cb5049958672..8b76ad4a16ea 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Port build tinderbox system
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
-		cvsup:${PORTSDIR}/net/cvsup
+		cvsup:${PORTSDIR}/net/cvsup-without-gui
 
 OPTIONS=	PGSQL "With pgsql" On \
 		MYSQL "With mysql" Off
diff --git a/ports-mgmt/tinderbox/files/pkg-message.in b/ports-mgmt/tinderbox/files/pkg-message.in
index 0cc18c1f3359..f45aad2edfc6 100644
--- a/ports-mgmt/tinderbox/files/pkg-message.in
+++ b/ports-mgmt/tinderbox/files/pkg-message.in
@@ -50,7 +50,6 @@ The following walkthrough is the tinderbox environment setup:
 The following walkthrough is the initial tinderbox population setup
 and should be executed in %%PREFIX%%/tinderbox/scripts.
 
-
 - Create a jail. A jail is a chrooted version of the FreeBSD operating
   system, for example 6.0-RELEASE or 5.4-RELEASE:
   ./create Jail -j 5.4 -d "FreeBSD 5.4-RELEASE" -t RELENG_5_4_0_RELEASE -u CVSUP
@@ -64,25 +63,38 @@ and should be executed in %%PREFIX%%/tinderbox/scripts.
 - And then link the two together in a build:
   ./create Build -b 5.4-FreeBSD -j 5.4 -p FreeBSD -d "5.4-RELEASE with FreeBSD ports tree"
 
-- Now the tinderbox is ready to be used. See the documents
-  %%PREFIX%%/tinderbox/scripts/README and the "Using Tinderbox"
-  section for more information.
-
 The following walkthrough is the webserver setup:
 
 - In your Apache configuration, add the following lines:
 
-  Alias /tb/ "/usr/local/tinderbox/scripts/www-exp"
-  <Directory "/usr/local/tinderbox/scripts/www-exp/">
+  Alias /tb/logs/ "/usr/local/tinderbox/logs/"
+  Alias /tb/packages/ "/usr/local/tinderbox/packages/"
+  Alias /tb/errors/ "/usr/local/tinderbox/errors/"
+  Alias /tb/ "/usr/local/tinderbox/scripts/www-exp/"
+  <Directory "/usr/local/tinderbox/">
       Order allow,deny
       Allow from all
   </Directory>
 
   Check your system by going to http://localhost/tb/
 
-- And now, the first port build!
+The following walkthrough is the first run for a port in the
+tinderbox and should be executed in %%PREFIX%%/tinderbox/scripts.
+
+- See the documents %%PREFIX%%/tinderbox/scripts/README and the
+  "Using Tinderbox" section for more information.
+
+- Add the port and its dependencies to the database:
+  ./tc addPort -b 5.4-FreeBSD -d net/dhcpdump -r
+
+- On the website you see now five ports on the build page.
+
+- Start the build:
+  ./tinderbuild -nullfs -b 5.4-FreeBSD dns/dnstracer
+
+- On the page "Current and latest builds in this build" you see the
+  current being-built port and the last n ports built.
 
-Now the tinderbox is ready to be used. See the documents
-%%PREFIX%%/tinderbox/scripts/README and the "Using Tinderbox" section
-for more information.
+- At a certain moment, when you refresh the page, you see that it
+  has changed.