- update to 2.3.3

- allow o RUN_DEPEND on LightHTTPD (for now apache is still brought in by php)
[1]

PR:		ports/105259 [1]
Submitted by:	shaun@ [1]

10 files changed, 128 insertions, 84 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 15254fc78d3a..36e11a9bcf63 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,23 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTVERSION=	2.3.3
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
+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
+		CVSUP "Use cvsup for updates" Off \
+		APACHE "Use Apache for web interface" On \
+		LIGHTTPD "Use LightHTTPD for web interface" Off
 
 NO_BUILD=	yes
-USE_APACHE=	1.3+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -34,6 +34,7 @@ MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
+WANT_PHP_WEB=	yes
 USE_PHP=	session
 
 .if defined(WITH_PGSQL)
@@ -59,6 +60,12 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
+.if !defined(WITHOUT_APACHE)
+USE_APACHE=	1.3+
+.elif defined(WITH_LIGHTTPD)
+RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+.endif
+
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 post-extract:
@@ -73,7 +80,7 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
-	@${RM} ${WRKSRC}/create.orig ${WRKSRC}/setup.sh.orig
+	 @${RM} ${WRKSRC}/tc.orig
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 6084db5b3cc5..52e9ad0b3791 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.2.tar.gz) = f33951c4003330f1ec22a7c3f823f16a
-SHA256 (tinderbox-2.3.2.tar.gz) = 4819dac4be303040c82de11868d49a1cadf81ad151e4d7fb905916b561ff41ff
-SIZE (tinderbox-2.3.2.tar.gz) = 121291
+MD5 (tinderbox-2.3.3.tar.gz) = a64db61ca4d67644ad553cfc952892dd
+SHA256 (tinderbox-2.3.3.tar.gz) = f38918915f25fb0a1b9619656daa671f92bada1e878592ccc4fc9d1cfde386eb
+SIZE (tinderbox-2.3.3.tar.gz) = 121344
diff --git a/ports-mgmt/tinderbox-devel/files/patch-create b/ports-mgmt/tinderbox-devel/files/patch-create
deleted file mode 100644
index e3b3b75bae45..000000000000
--- a/ports-mgmt/tinderbox-devel/files/patch-create
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: create
-===================================================================
-RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/Attic/create,v
-retrieving revision 1.5.2.3
-diff -u -r1.5.2.3 create
---- create	6 Apr 2006 05:18:24 -0000	1.5.2.3
-+++ create	13 Sep 2006 19:51:46 -0000
-@@ -49,7 +49,13 @@
- 
- tcExists () {
-     list=$(${pb}/scripts/tc list$1 2>/dev/null)
--    echo ${list} | grep -qw $2
-+    for obj in ${list}; do
-+	if [ x"${obj}" = x"$2" ]; then
-+	    return 0
-+	fi
-+    done
-+
-+    return 1
- }
- 
- cleanDirs () {
diff --git a/ports-mgmt/tinderbox-devel/files/patch-setup.sh b/ports-mgmt/tinderbox-devel/files/patch-setup.sh
deleted file mode 100644
index 96c9b2af6e7c..000000000000
--- a/ports-mgmt/tinderbox-devel/files/patch-setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.sh.orig	Wed Sep 27 21:23:59 2006
-+++ ./setup.sh	Wed Sep 27 21:24:43 2006
-@@ -33,7 +33,7 @@
- pb=$(realpath $(dirname $pb))
- pb=${pb%%/scripts}
- 
--MAN_PREREQS="lang/perl5.8 net/p5-Net security/p5-Digest-MD5"
-+MAN_PREREQS="lang/perl5.8"
- OPT_PREREQS="lang/php[45] databases/pear-DB www/php[45]-session"
- PREF_FILES="rawenv tinderbox.ph"
- README="${pb}/scripts/README"
diff --git a/ports-mgmt/tinderbox-devel/files/patch-tc b/ports-mgmt/tinderbox-devel/files/patch-tc
new file mode 100644
index 000000000000..e1730feac058
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-tc
@@ -0,0 +1,48 @@
+--- tc.dist	2006/10/24 06:20:10	1.67.2.15
++++ tc	2006/10/30 07:01:49	1.67.2.17
+@@ -2962,20 +2962,23 @@ sub addPorts {
+ }
+ 
+ sub tbcleanup {
+-        my @builds = $ds->getAllBuilds();
+-        my @ports  = $ds->getAllPorts();
+-        my %requestMountArgs;
++        my @builds     = $ds->getAllBuilds();
++        my @ports      = $ds->getAllPorts();
++        my @portstrees = $ds->getAllPortsTrees();
++
++        foreach my $portstree (@portstrees) {
++                my %requestMountArgs;
++                $requestMountArgs{'quiet'}       = 1;
++                $requestMountArgs{'readonly'}    = 1;
++                $requestMountArgs{'portstree'}   = $portstree->getName();
++                $requestMountArgs{'destination'} = "portstree";
++                requestMount($BUILD_ROOT, %requestMountArgs);
++        }
+ 
+         foreach my $port (@ports) {
+-                my @portstrees = $ds->getAllPortsTrees();
+-                my $pathFound  = 0;
++                my $pathFound = 0;
+ 
+                 foreach my $portstree (@portstrees) {
+-                        $requestMountArgs{'quiet'}     = 1;
+-                        $requestMountArgs{'readonly'}  = 1;
+-                        $requestMountArgs{'portstree'} = $portstree->getName();
+-                        $requestMountArgs{'destination'} = "portstree";
+-                        requestMount($PORTSTREES_DIR, %requestMountArgs);
+                         my $path = join("/",
+                                 $PORTSTREES_DIR, $portstree->getName(), "ports",
+                                 $port->getDirectory(), "Makefile");
+@@ -3023,11 +3026,6 @@ sub tbcleanup {
+ 
+                         my $portstree =
+                             $ds->getPortsTreeById($build->getPortsTreeId());
+-                        $requestMountArgs{'quiet'}     = 1;
+-                        $requestMountArgs{'readonly'}  = 1;
+-                        $requestMountArgs{'portstree'} = $portstree->getName();
+-                        $requestMountArgs{'destination'} = "portstree";
+-                        requestMount($PORTSTREES_DIR, %requestMountArgs);
+ 
+                         $path = join("/",
+                                 $PORTSTREES_DIR, $portstree->getName(), "ports",
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 15254fc78d3a..36e11a9bcf63 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -5,23 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTVERSION=	2.3.3
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
+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
+		CVSUP "Use cvsup for updates" Off \
+		APACHE "Use Apache for web interface" On \
+		LIGHTTPD "Use LightHTTPD for web interface" Off
 
 NO_BUILD=	yes
-USE_APACHE=	1.3+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -34,6 +34,7 @@ MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
+WANT_PHP_WEB=	yes
 USE_PHP=	session
 
 .if defined(WITH_PGSQL)
@@ -59,6 +60,12 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
+.if !defined(WITHOUT_APACHE)
+USE_APACHE=	1.3+
+.elif defined(WITH_LIGHTTPD)
+RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+.endif
+
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 post-extract:
@@ -73,7 +80,7 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
-	@${RM} ${WRKSRC}/create.orig ${WRKSRC}/setup.sh.orig
+	 @${RM} ${WRKSRC}/tc.orig
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index 6084db5b3cc5..52e9ad0b3791 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.2.tar.gz) = f33951c4003330f1ec22a7c3f823f16a
-SHA256 (tinderbox-2.3.2.tar.gz) = 4819dac4be303040c82de11868d49a1cadf81ad151e4d7fb905916b561ff41ff
-SIZE (tinderbox-2.3.2.tar.gz) = 121291
+MD5 (tinderbox-2.3.3.tar.gz) = a64db61ca4d67644ad553cfc952892dd
+SHA256 (tinderbox-2.3.3.tar.gz) = f38918915f25fb0a1b9619656daa671f92bada1e878592ccc4fc9d1cfde386eb
+SIZE (tinderbox-2.3.3.tar.gz) = 121344
diff --git a/ports-mgmt/tinderbox/files/patch-create b/ports-mgmt/tinderbox/files/patch-create
deleted file mode 100644
index e3b3b75bae45..000000000000
--- a/ports-mgmt/tinderbox/files/patch-create
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: create
-===================================================================
-RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/Attic/create,v
-retrieving revision 1.5.2.3
-diff -u -r1.5.2.3 create
---- create	6 Apr 2006 05:18:24 -0000	1.5.2.3
-+++ create	13 Sep 2006 19:51:46 -0000
-@@ -49,7 +49,13 @@
- 
- tcExists () {
-     list=$(${pb}/scripts/tc list$1 2>/dev/null)
--    echo ${list} | grep -qw $2
-+    for obj in ${list}; do
-+	if [ x"${obj}" = x"$2" ]; then
-+	    return 0
-+	fi
-+    done
-+
-+    return 1
- }
- 
- cleanDirs () {
diff --git a/ports-mgmt/tinderbox/files/patch-setup.sh b/ports-mgmt/tinderbox/files/patch-setup.sh
deleted file mode 100644
index 96c9b2af6e7c..000000000000
--- a/ports-mgmt/tinderbox/files/patch-setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.sh.orig	Wed Sep 27 21:23:59 2006
-+++ ./setup.sh	Wed Sep 27 21:24:43 2006
-@@ -33,7 +33,7 @@
- pb=$(realpath $(dirname $pb))
- pb=${pb%%/scripts}
- 
--MAN_PREREQS="lang/perl5.8 net/p5-Net security/p5-Digest-MD5"
-+MAN_PREREQS="lang/perl5.8"
- OPT_PREREQS="lang/php[45] databases/pear-DB www/php[45]-session"
- PREF_FILES="rawenv tinderbox.ph"
- README="${pb}/scripts/README"
diff --git a/ports-mgmt/tinderbox/files/patch-tc b/ports-mgmt/tinderbox/files/patch-tc
new file mode 100644
index 000000000000..e1730feac058
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-tc
@@ -0,0 +1,48 @@
+--- tc.dist	2006/10/24 06:20:10	1.67.2.15
++++ tc	2006/10/30 07:01:49	1.67.2.17
+@@ -2962,20 +2962,23 @@ sub addPorts {
+ }
+ 
+ sub tbcleanup {
+-        my @builds = $ds->getAllBuilds();
+-        my @ports  = $ds->getAllPorts();
+-        my %requestMountArgs;
++        my @builds     = $ds->getAllBuilds();
++        my @ports      = $ds->getAllPorts();
++        my @portstrees = $ds->getAllPortsTrees();
++
++        foreach my $portstree (@portstrees) {
++                my %requestMountArgs;
++                $requestMountArgs{'quiet'}       = 1;
++                $requestMountArgs{'readonly'}    = 1;
++                $requestMountArgs{'portstree'}   = $portstree->getName();
++                $requestMountArgs{'destination'} = "portstree";
++                requestMount($BUILD_ROOT, %requestMountArgs);
++        }
+ 
+         foreach my $port (@ports) {
+-                my @portstrees = $ds->getAllPortsTrees();
+-                my $pathFound  = 0;
++                my $pathFound = 0;
+ 
+                 foreach my $portstree (@portstrees) {
+-                        $requestMountArgs{'quiet'}     = 1;
+-                        $requestMountArgs{'readonly'}  = 1;
+-                        $requestMountArgs{'portstree'} = $portstree->getName();
+-                        $requestMountArgs{'destination'} = "portstree";
+-                        requestMount($PORTSTREES_DIR, %requestMountArgs);
+                         my $path = join("/",
+                                 $PORTSTREES_DIR, $portstree->getName(), "ports",
+                                 $port->getDirectory(), "Makefile");
+@@ -3023,11 +3026,6 @@ sub tbcleanup {
+ 
+                         my $portstree =
+                             $ds->getPortsTreeById($build->getPortsTreeId());
+-                        $requestMountArgs{'quiet'}     = 1;
+-                        $requestMountArgs{'readonly'}  = 1;
+-                        $requestMountArgs{'portstree'} = $portstree->getName();
+-                        $requestMountArgs{'destination'} = "portstree";
+-                        requestMount($PORTSTREES_DIR, %requestMountArgs);
+ 
+                         $path = join("/",
+                                 $PORTSTREES_DIR, $portstree->getName(), "ports",