5 files changed, 160 insertions, 0 deletions

diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 5d96a080db1b..eeedefc9a9bd 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/ports-mgmt/tinderbox/files/patch-lib-buildscript b/ports-mgmt/tinderbox/files/patch-lib-buildscript
new file mode 100644
index 000000000000..deb1ce2b320c
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-lib-buildscript
@@ -0,0 +1,80 @@
+--- lib/buildscript.orig	2009-11-27 18:32:31.000000000 +0100
++++ lib/buildscript	2009-12-25 21:06:55.000000000 +0100
+@@ -103,7 +103,6 @@
+ PLISTCHECK=$8
+ 
+ L=$(echo ${LOCALBASE} | sed 's,^/,,')
+-X=$(echo ${X11BASE} | sed 's,^/,,')
+ 
+ if [ $phase = 1 ]; then
+ 
+@@ -113,7 +112,7 @@
+   echo "building for:  $(uname -rm)"
+   echo "maintained by: $(make maintainer)"
+   echo "Makefile ident: $(ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//')"
+-  echo "prefixes: LOCALBASE=${L} X11BASE=${X} PREFIX=$(make -V PREFIX)"
++  echo "prefixes: LOCALBASE=${L} PREFIX=$(make -V PREFIX)"
+   echo "Begin Configuration:"
+   echo "---Begin Environment---"
+   printenv
+@@ -162,7 +161,6 @@
+ ./${L}/etc/apache2
+ ./${L}/news
+ ./${L}/share/xml
+-./${X}/etc/gconf
+ ./${L}/etc/gconf
+ ./var/db/fontconfig
+ EOF
+@@ -231,7 +229,6 @@
+ ./${L}/etc/apache2
+ ./${L}/news
+ ./${L}/share/xml
+-./${X}/etc/gconf
+ ./${L}/etc/gconf
+ ./var/db/fontconfig
+ EOF
+@@ -270,7 +267,7 @@
+   /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test
+   cat /tmp/make.log5
+ 
+-  mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|usr/X11R6 )" > /tmp/list.preinstall
++  mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L}/info/dir|${L}/man/..( |/man. )|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|usr/X11R6 )" > /tmp/list.preinstall
+ 
+   if [ -s /tmp/list.preinstall ]; then
+       echo "================================================================"
+@@ -322,7 +319,7 @@
+   del_pkg ${pkgname}
+ 
+ 
+-  mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3
++  mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L}/info/dir|${L}/man/..( |/man. )|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3
+ 
+   dirty=0
+   if [ -s /tmp/list3 ]; then
+@@ -331,7 +328,7 @@
+     grep ' missing$' /tmp/list3 > /tmp/list5
+     grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
+     if [ -n "${PLISTCHECK}" ]; then
+-      if grep -vqE "(${X}|${L})/etc/" /tmp/list4; then
++      if grep -vqE "(${L})/etc/" /tmp/list4; then
+         echo "1" > /tmp/status
+         dirty=1
+       fi
+@@ -379,7 +376,7 @@
+   fi
+ 
+   # Compare the state of the filesystem now to clean system (should again be clean)
+-  mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3
++  mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L}/info/dir|${L}/man/..( |/man. )|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3
+   echo
+   echo "=== Checking filesystem state after all packages deleted"
+ 
+@@ -389,7 +386,7 @@
+       grep ' missing$' /tmp/list3 > /tmp/list5
+       grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
+       if [ -n "${PLISTCHECK}" ]; then
+-	  if grep -vqE "(${X}|${L})/etc/" /tmp/list4; then
++	  if grep -vqE "(${L})/etc/" /tmp/list4; then
+ 	      #echo "1" > /tmp/status
+ 	  fi
+ 	  if [ -s /tmp/list5 ]; then
diff --git a/ports-mgmt/tinderbox/files/patch-lib-portbuild b/ports-mgmt/tinderbox/files/patch-lib-portbuild
new file mode 100644
index 000000000000..227046456108
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-lib-portbuild
@@ -0,0 +1,44 @@
+--- lib/portbuild.orig	2009-11-27 18:32:31.000000000 +0100
++++ lib/portbuild	2009-12-25 21:07:00.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# $MCom: portstools/tinderbox/lib/portbuild,v 1.123.2.5 2009/10/17 19:48:36 marcus Exp $
++# $MCom: portstools/tinderbox/lib/portbuild,v 1.123.2.6 2009/12/24 17:23:32 marcus Exp $
+ 
+ . ${pb}/scripts/lib/tinderlib.sh
+ 
+@@ -170,7 +170,7 @@
+ fi
+ 
+ # directories to clean
+-cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg"
++cleandirs="${LOCALBASE} /compat /var/db/pkg"
+ 
+ for dir in ${cleandirs}; do
+     cleanDirs ${build} ${chroot}${dir}
+@@ -194,15 +194,6 @@
+     	>/dev/null 2>&1
+ fi
+ 
+-mkdir -p ${chroot}${X11BASE}
+-case "${X_WINDOW_SYSTEM}" in
+-  "xfree86-3")	_X_MTREE="BSD.x11.dist";;
+-  *)		_X_MTREE="BSD.x11-4.dist";;
+-esac
+-mkdir -p ${chroot}${X11BASE}
+-mtree -deU -f ${chroot}/etc/mtree/${_X_MTREE} -p ${chroot}${X11BASE} \
+-      >/dev/null 2>&1
+-
+ # mount linprocfs if required
+ if [ "${ARCH}" = "i386" -o "${ARCH}" = "amd64" ]; then
+     mkdir -p ${chroot}/compat/linux/proc
+@@ -244,7 +235,7 @@
+ ulimit -f 16384000
+ ulimit -t 7200
+ 
+-export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin
++export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin
+ 
+ # Set HOME to be /root to avoid errant leftover files
+ export HOME=/root
diff --git a/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env b/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env
new file mode 100644
index 000000000000..dc7c359d930b
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env
@@ -0,0 +1,16 @@
+--- lib/tinderbox.env.orig	2009-11-27 18:32:31.000000000 +0100
++++ lib/tinderbox.env	2009-12-25 21:07:09.000000000 +0100
+@@ -1,4 +1,4 @@
+-# $MCom: portstools/tinderbox/lib/tinderbox.env,v 1.27.2.1 2009/08/22 23:28:31 marcus Exp $
++# $MCom: portstools/tinderbox/lib/tinderbox.env,v 1.27.2.2 2009/12/24 17:23:32 marcus Exp $
+ #
+ # Global environmental variable declarations, which can be overridden
+ # on any of a per-build, per-jail and/or per-portstree basis
+@@ -23,7 +23,6 @@
+ #9X_WINDOW_SYSTEM=xorg
+ #
+ LOCALBASE=/usr/local
+-X11BASE=/usr/local
+ OSVERSION=`awk '/^#define __FreeBSD_version/ {print $3}' < ^^SRCBASE^^/sys/sys/param.h`
+ OSREL=`awk 'BEGIN {FS="\""}; /^REVISION/ {print $2}' < ^^SRCBASE^^/sys/conf/newvers.sh`
+ BRANCH=`awk 'BEGIN {FS="\""}; /^BRANCH/ {print $2}' < ^^SRCBASE^^/sys/conf/newvers.sh`
diff --git a/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh b/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh
new file mode 100644
index 000000000000..206acbb3e95c
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh
@@ -0,0 +1,19 @@
+--- lib/tinderlib.sh.orig	2009-11-27 18:32:31.000000000 +0100
++++ lib/tinderlib.sh	2009-12-25 21:07:17.000000000 +0100
+@@ -23,7 +23,7 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ #
+-# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.5 2009/03/14 23:57:13 marcus Exp $
++# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.6 2009/12/24 17:23:32 marcus Exp $
+ #
+ 
+ tinderLocJail () {
+@@ -505,7 +505,6 @@
+     jailBase=$(tinderLoc jail ${jail})
+     eval "export __MAKE_CONF=${jailBase}/make.conf" >/dev/null 2>&1
+     eval "export LOCALBASE=/nonexistentlocal" >/dev/null 2>&1
+-    eval "export X11BASE=/nonexistentx" >/dev/null 2>&1
+     eval "export PKG_DBDIR=/nonexistentdb" >/dev/null 2>&1
+     if [ x"${OPTIONS_ENABLED}" != x"1" ]; then
+         eval "export PORT_DBDIR=/nonexistentportdb" >/dev/null 2>&1