diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index e59c63ebd2ef..6b216e3548dc 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -1,138 +1,135 @@
 # Ports collection makefile for:	misc/tinderbox
 # Whom:			Edwin Groothuis <edwin@mavetju.org>
 # Date created:		31 december 2005
 #
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
 		CVSUP "Use cvsup for updates" Off \
 		WEB   "Install web interface" Off \
 		WEB_EXP "Install the new web interface" On \
 		APACHE "Use Apache for web interface" On \
 		LIGHTTPD "Use LightHTTPD for web interface" Off
 
 NO_BUILD=	yes
 WANT_PERL=	yes
 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
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITH_PGSQL) && defined(WITHOUT_MYSQL)
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 MASTER_SITES+=	http://miwibox.org/:FAVICON
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		favicon.ico:FAVICON
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 .if defined(WITH_WEB)
 PLIST_SUB+=	WEB=""
 .else
 PLIST_SUB+=	WEB="@comment "
 .endif
 
 .if !defined(WITHOUT_WEB_EXP)
 PLIST_SUB+=	WEB_EXP=""
 .else
 PLIST_SUB+=	WEB_EXP="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	pgsql
 .endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if !defined(WITHOUT_MYSQL)
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
 IGNORE_WITH_MYSQL=	323 40
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER:S/323//}
 .endif
 
 .if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 .if !defined(WITHOUT_CSUP)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
 .endif
 
 .if defined(WITH_CVSUP)
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
 .if !defined(WITHOUT_APACHE) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 USE_APACHE=	1.3+
 .elif defined(WITH_LIGHTTPD) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
 pre-everything::
 .if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !(defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
 	@${FALSE}
 .endif
 
 post-patch:
 .if defined(WITH_MYSQL)
 	@${REINPLACE_CMD} \
 		-e 's,DB_MAN_PREREQS=.*,DB_MAN_PREREQS="databases/p5-DBD-mysql${MYSQL_VER} databases/mysql${MYSQL_VER}-client",' \
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
-	@${RM} ${WRKSRC}/rawenv.dist.orig
-	@${RM} ${WRKSRC}/portbuild.orig
 .endif
 .if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
 		${WRKSRC}/create
 	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
 		${WRKSRC}/tc
 	@${RM} ${WRKSRC}/create.bak
 	@${RM} ${WRKSRC}/tc.bak
 .endif
 
 pre-install:
 .if !defined(WITH_WEB)
 	${RM} -R ${WRKSRC}/www
 .else
 	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www
 .endif
 .if defined(WITHOUT_WEB_EXP)
 	${RM} -R ${WRKSRC}/www-exp
 .else
 	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www-exp
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
 
 post-install:
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 5884aaa30adb..27abad8dc9b7 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox-2.4.1.tar.gz) = ebde71863221d05c6b99e543095e3454
-SHA256 (tinderbox-2.4.1.tar.gz) = eedbfd4242df934105b3c9709f6ef4d16c5930b3e6e1b47207cb21f2704a16e1
-SIZE (tinderbox-2.4.1.tar.gz) = 130693
+MD5 (tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
+SHA256 (tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
+SIZE (tinderbox-2.4.2.tar.gz) = 130770
 MD5 (favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox-devel/files/patch-portbuild b/ports-mgmt/tinderbox-devel/files/patch-portbuild
deleted file mode 100644
index 6322d2f1bdde..000000000000
--- a/ports-mgmt/tinderbox-devel/files/patch-portbuild
+++ /dev/null
@@ -1,11 +0,0 @@
---- portbuild.orgi	2007-10-23 19:33:58.000000000 +0200
-+++ portbuild	2007-10-23 19:34:31.000000000 +0200
-@@ -287,7 +287,7 @@
- 	fi
- 	cp -p /lib/libc.so.5 ${chroot}/lib
-     fi
--elif [ "${major_version}" = "6" -o "${major_version}" = "7" ]; then
-+    elif [ "${major_version}" = "6" -o "${major_version}" = "7" -o "${major_version}" = "8" ]; then
-     if [ -f /lib/libc.so.5 ]; then
-         if [ -f ${chroot}/lib/libc.so.5 ]; then
- 	    chflags noschg ${chroot}/lib/libc.so.5
diff --git a/ports-mgmt/tinderbox-devel/files/patch-rawenv.dist b/ports-mgmt/tinderbox-devel/files/patch-rawenv.dist
deleted file mode 100644
index 3bb340eb0e0c..000000000000
--- a/ports-mgmt/tinderbox-devel/files/patch-rawenv.dist
+++ /dev/null
@@ -1,13 +0,0 @@
---- rawenv.dist.orig	2007-10-23 19:35:34.000000000 +0200
-+++ rawenv.dist	2007-10-23 19:36:10.000000000 +0200
-@@ -19,6 +19,10 @@
- #7PKGZIPCMD=bzip2
- #7INDEXFILE=INDEX-7
- #7X_WINDOW_SYSTEM=xorg
-+#8PKGSUFFIX=.tbz
-+#8PKGZIPCMD=bzip2
-+#8INDEXFILE=INDEX-7
-+#8X_WINDOW_SYSTEM=xorg
- ##MACHINE_ARCH=i386
- LOCALBASE=/usr/local
- X11BASE=/usr/local
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index e59c63ebd2ef..6b216e3548dc 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -1,138 +1,135 @@
 # Ports collection makefile for:	misc/tinderbox
 # Whom:			Edwin Groothuis <edwin@mavetju.org>
 # Date created:		31 december 2005
 #
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
 		CVSUP "Use cvsup for updates" Off \
 		WEB   "Install web interface" Off \
 		WEB_EXP "Install the new web interface" On \
 		APACHE "Use Apache for web interface" On \
 		LIGHTTPD "Use LightHTTPD for web interface" Off
 
 NO_BUILD=	yes
 WANT_PERL=	yes
 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
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITH_PGSQL) && defined(WITHOUT_MYSQL)
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 MASTER_SITES+=	http://miwibox.org/:FAVICON
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		favicon.ico:FAVICON
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 .if defined(WITH_WEB)
 PLIST_SUB+=	WEB=""
 .else
 PLIST_SUB+=	WEB="@comment "
 .endif
 
 .if !defined(WITHOUT_WEB_EXP)
 PLIST_SUB+=	WEB_EXP=""
 .else
 PLIST_SUB+=	WEB_EXP="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	pgsql
 .endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if !defined(WITHOUT_MYSQL)
 .if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
 IGNORE_WITH_MYSQL=	323 40
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER:S/323//}
 .endif
 
 .if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 .if !defined(WITHOUT_CSUP)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
 .endif
 
 .if defined(WITH_CVSUP)
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
 .if !defined(WITHOUT_APACHE) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 USE_APACHE=	1.3+
 .elif defined(WITH_LIGHTTPD) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
 pre-everything::
 .if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !(defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
 	@${FALSE}
 .endif
 
 post-patch:
 .if defined(WITH_MYSQL)
 	@${REINPLACE_CMD} \
 		-e 's,DB_MAN_PREREQS=.*,DB_MAN_PREREQS="databases/p5-DBD-mysql${MYSQL_VER} databases/mysql${MYSQL_VER}-client",' \
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
-	@${RM} ${WRKSRC}/rawenv.dist.orig
-	@${RM} ${WRKSRC}/portbuild.orig
 .endif
 .if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
 		${WRKSRC}/create
 	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
 		${WRKSRC}/tc
 	@${RM} ${WRKSRC}/create.bak
 	@${RM} ${WRKSRC}/tc.bak
 .endif
 
 pre-install:
 .if !defined(WITH_WEB)
 	${RM} -R ${WRKSRC}/www
 .else
 	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www
 .endif
 .if defined(WITHOUT_WEB_EXP)
 	${RM} -R ${WRKSRC}/www-exp
 .else
 	${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www-exp
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
 
 post-install:
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index 5884aaa30adb..27abad8dc9b7 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox-2.4.1.tar.gz) = ebde71863221d05c6b99e543095e3454
-SHA256 (tinderbox-2.4.1.tar.gz) = eedbfd4242df934105b3c9709f6ef4d16c5930b3e6e1b47207cb21f2704a16e1
-SIZE (tinderbox-2.4.1.tar.gz) = 130693
+MD5 (tinderbox-2.4.2.tar.gz) = 339dbbd9cde403e54771ef8d0f4101d4
+SHA256 (tinderbox-2.4.2.tar.gz) = 578264daf7fbfad97cadeade58517cfa748c8e366e1e9884dbd1854db47b4d63
+SIZE (tinderbox-2.4.2.tar.gz) = 130770
 MD5 (favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox/files/patch-portbuild b/ports-mgmt/tinderbox/files/patch-portbuild
deleted file mode 100644
index 6322d2f1bdde..000000000000
--- a/ports-mgmt/tinderbox/files/patch-portbuild
+++ /dev/null
@@ -1,11 +0,0 @@
---- portbuild.orgi	2007-10-23 19:33:58.000000000 +0200
-+++ portbuild	2007-10-23 19:34:31.000000000 +0200
-@@ -287,7 +287,7 @@
- 	fi
- 	cp -p /lib/libc.so.5 ${chroot}/lib
-     fi
--elif [ "${major_version}" = "6" -o "${major_version}" = "7" ]; then
-+    elif [ "${major_version}" = "6" -o "${major_version}" = "7" -o "${major_version}" = "8" ]; then
-     if [ -f /lib/libc.so.5 ]; then
-         if [ -f ${chroot}/lib/libc.so.5 ]; then
- 	    chflags noschg ${chroot}/lib/libc.so.5
diff --git a/ports-mgmt/tinderbox/files/patch-rawenv.dist b/ports-mgmt/tinderbox/files/patch-rawenv.dist
deleted file mode 100644
index 3bb340eb0e0c..000000000000
--- a/ports-mgmt/tinderbox/files/patch-rawenv.dist
+++ /dev/null
@@ -1,13 +0,0 @@
---- rawenv.dist.orig	2007-10-23 19:35:34.000000000 +0200
-+++ rawenv.dist	2007-10-23 19:36:10.000000000 +0200
-@@ -19,6 +19,10 @@
- #7PKGZIPCMD=bzip2
- #7INDEXFILE=INDEX-7
- #7X_WINDOW_SYSTEM=xorg
-+#8PKGSUFFIX=.tbz
-+#8PKGZIPCMD=bzip2
-+#8INDEXFILE=INDEX-7
-+#8X_WINDOW_SYSTEM=xorg
- ##MACHINE_ARCH=i386
- LOCALBASE=/usr/local
- X11BASE=/usr/local