pkgtools/tinderbox-dragonfly: Update to version 3.4.1

Besides syncing with FreeBSD Tinderbox 3.4.1, the following updates were
included:
1) Creating bulkbuild handling script
2) Created postPortBuild hook script to support bulk builds
3) Fixed fake "wrong arch" error due to funky licenses
4) Deviated "mark_failed()" from Tinderbox-FreeBSD to fire postPortBuild
   hook for ports marked failed due to failed dependency
5) Added tc_command.pl patch that should have gone in previous update to
   support pkgsrc scan bulk script

10 files changed, 248 insertions, 178 deletions

diff --git a/pkgtools/tinderbox-dragonfly/Makefile b/pkgtools/tinderbox-dragonfly/Makefile
index 927506f2d38..4a6447ae24b 100644
--- a/pkgtools/tinderbox-dragonfly/Makefile
+++ b/pkgtools/tinderbox-dragonfly/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/11/14 02:00:19 marino Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/20 16:20:24 marino Exp $
 #
 
 DISTNAME=	tinderbox-dragonfly-${TBOX_VERSION}
-PKGREVISION=	1
 CATEGORIES=	pkgtools
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 DISTFILES=	tinderbox-${TBOX_VERSION}.tar.gz
@@ -16,7 +15,7 @@ DEPENDS+=	p5-Compress-Bzip2>=2:../../archivers/p5-Compress-Bzip2
 DEPENDS+=	csup>=20100101:../../net/csup
 DEPENDS+=	scmgit>1.6:../../devel/scmgit
 
-TBOX_VERSION=		3.4
+TBOX_VERSION=		3.4.1
 PKG_DESTDIR_SUPPORT=	user-destdir
 ONLY_FOR_PLATFORM=	DragonFly-*-*
 
@@ -34,6 +33,8 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	contrib/bulk/add_all_packages.sh
+SUBST_FILES.paths+=	contrib/bulk/bulk_hook_1.sh
+SUBST_FILES.paths+=	contrib/bulk/bulkbuild.sh
 SUBST_SED.paths+=	-e 's,@TINROOT@,${PREFIX}/tinderbox,g'
 SUBST_STAGE.paths=	post-patch
 
@@ -46,8 +47,10 @@ post-extract:
 .endif
 	mv ${WRKSRC}/etc/rc.d ${TRASH}
 	${MKDIR} ${WRKSRC}/contrib/bulk
-	${CP} ${FILESDIR}/add_all_packages.sh.in \
-		${WRKSRC}/contrib/bulk/add_all_packages.sh
+	for dossier in add_all_packages bulk_hook_1 bulkbuild; do \
+		${CP} ${FILESDIR}/$${dossier}.sh.in \
+		${WRKSRC}/contrib/bulk/$${dossier}.sh; \
+	done
 	chmod 755 ${WRKSRC}/contrib/bulk/*
 
 post-patch:
diff --git a/pkgtools/tinderbox-dragonfly/PLIST b/pkgtools/tinderbox-dragonfly/PLIST
index cc7d49d91b1..1f21a4aa0aa 100644
--- a/pkgtools/tinderbox-dragonfly/PLIST
+++ b/pkgtools/tinderbox-dragonfly/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/14 02:00:19 marino Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/11/20 16:20:24 marino Exp $
 man/man1/tc-configCcache.1
 man/man1/tc-configDistfile.1
 man/man1/tc-configGet.1
@@ -19,6 +19,8 @@ tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh
 tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt
 tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh
 tinderbox/scripts/contrib/bulk/add_all_packages.sh
+tinderbox/scripts/contrib/bulk/bulkbuild.sh
+tinderbox/scripts/contrib/bulk/bulk_hook_1.sh
 tinderbox/scripts/etc/env/.keep_me
 tinderbox/scripts/lib/Tinderbox/Build.pm
 tinderbox/scripts/lib/Tinderbox/BuildPortsQueue.pm
@@ -73,6 +75,7 @@ tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.2_to_3.2.3.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.3_to_3.2.4.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.4_to_3.2.5.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.5_to_3.2.6.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.6_to_3.3.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.0_to_3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2_to_3.2.1.sql
@@ -81,6 +84,7 @@ tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.2_to_3.2.3.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.3_to_3.2.4.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.4_to_3.2.5.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.5_to_3.2.6.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.6_to_3.3.sql
 tinderbox/scripts/upgrade/order.lst
 tinderbox/scripts/upgrade/user_permissions.map
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/Build.php
diff --git a/pkgtools/tinderbox-dragonfly/distinfo b/pkgtools/tinderbox-dragonfly/distinfo
index 968d3edac2f..b6260793ff1 100644
--- a/pkgtools/tinderbox-dragonfly/distinfo
+++ b/pkgtools/tinderbox-dragonfly/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.2 2011/11/14 02:00:19 marino Exp $
+$NetBSD: distinfo,v 1.3 2011/11/20 16:20:24 marino Exp $
 
-SHA1 (tinderbox-3.4.tar.gz) = bcabfc7544945b9e832fa573fd13a48005e2a598
-RMD160 (tinderbox-3.4.tar.gz) = 4783292e3d89f9ded643d57c1f0055b5fc53e3a9
-Size (tinderbox-3.4.tar.gz) = 147218 bytes
-SHA1 (patch-aa) = 13f228c8f4b1e1df590f7e0a9687dd219d6b08a5
+SHA1 (tinderbox-3.4.1.tar.gz) = bfa81429749cb3045887d54a7d83d76632404870
+RMD160 (tinderbox-3.4.1.tar.gz) = 00b74f300c202e45d224b1c6c1bde1d8c21f3e44
+Size (tinderbox-3.4.1.tar.gz) = 147755 bytes
+SHA1 (patch-aa) = dbc9dec65413065b2c492a15b70c0ea1928c8798
 SHA1 (patch-ab) = bead83362c0dbba1b71d11a076efb439fe3ac545
 SHA1 (patch-ac) = 7f62eacc4bea13a4fa36f6d84dab8750ca842366
 SHA1 (patch-ad) = 12c92ac0aeaf04260151d2e9e305cb6594cc3107
 SHA1 (patch-ae) = 57443a64d043d6549f19c99b431ea45ad29ba41e
-SHA1 (patch-ag) = 9f83f30fab9efe424c197d3f9fe8d7b3c3b924bc
-SHA1 (patch-ah) = ddfdb143e7eee5e838b8ab9affbf6992016f05f1
-SHA1 (patch-ai) = 19ec42335fbc37eed602222b20e8e21a20434baf
+SHA1 (patch-ai) = b3ece9f6651a3ea2fc762a7818971fe69a18f6ef
 SHA1 (patch-aj) = 5a6565b6844f6dbd7bb0dcd5aba74d722ae2e61b
 SHA1 (patch-ak) = af511026851a0faa893d461c4de44895d0d04410
 SHA1 (patch-al) = 0418a6aacc1ce7071a859bf69e8a29e47b64e197
@@ -19,12 +17,12 @@ SHA1 (patch-an) = f91e604e1487f99374fc3119475ab775cf8257de
 SHA1 (patch-ao) = b8635fa0fb158855a1f20d29f9251e045e2b9357
 SHA1 (patch-ap) = 6dc77ea10efb8bdf26f4fc2330f89b70cba8aaab
 SHA1 (patch-aq) = 7cc9e2f723d192038d196da94fdfd8c569559458
-SHA1 (patch-ar) = c57b04957c9ba3a140a623972d5e18e130f8dbc8
-SHA1 (patch-as) = 3cbee34e564ce7b46e17e04422770acee877e0dd
+SHA1 (patch-ar) = 7cdf8aa5c0e0b44c9a1b4e7b878d616c251e62d9
+SHA1 (patch-as) = 4406f887e23b31bc2e1f2e8a55476125ee1bce8a
 SHA1 (patch-at) = f46d54fab4f94e0b6778d26ac84ce933f734c6d5
 SHA1 (patch-au) = 27e654af19184d3a5a9028442b80556417bd45c8
 SHA1 (patch-av) = 806b9d4538f13d54b023b9630b74f3b859a65f67
-SHA1 (patch-aw) = 77446405f7c969d2b7b43e234bd7bcde533ed4a2
+SHA1 (patch-aw) = 73f14c8d3d8df6afd987e5c30dbb658565bf3568
 SHA1 (patch-az) = 91526a66f47d53357703b2739c1384d4012e7c6c
 SHA1 (patch-ba) = 636adea0d3fb22132e2a6d81fd016a9560017aca
 SHA1 (patch-bb) = 7a007428deeea2f243cebcc84a42e0c5fbebc9a7
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-aa b/pkgtools/tinderbox-dragonfly/patches/patch-aa
index e79a4b0d54b..7a78f691545 100644
--- a/pkgtools/tinderbox-dragonfly/patches/patch-aa
+++ b/pkgtools/tinderbox-dragonfly/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/20 16:20:24 marino Exp $
 
---- ../FreeBSD/lib/tc_command.sh	2011-10-16 00:52:55.000000000 +0000
+--- ../FreeBSD/lib/tc_command.sh	2011-11-20 13:11:37.088510000 +0000
 +++ lib/tc_command.sh
 @@ -27,21 +27,46 @@
- # $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.45 2011/10/17 01:01:23 marcus Exp $
+ # $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.48 2011/11/15 07:04:35 marcus Exp $
  #
  
 -export _defaultUpdateHost="cvsup18.FreeBSD.org"
@@ -198,28 +198,62 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  		fi
  
  		( echo "*default host=${4}"
-@@ -160,6 +190,45 @@ generateUpdateCode () {
+@@ -159,49 +189,42 @@ generateUpdateCode () {
+ 		) > ${treeDir}/update.sh
  		chmod +x ${treeDir}/update.sh
  		;;
+-    "SVN")
+-    		if [ -z "${8}" ]; then
+-		    echo "ERROR: ${1} ${2}: no protocol specified for ${3}"
+-		    exit 1
+-		fi
  
+-    		if [ -z "${9}" ]; then
+-		    echo "ERROR: ${1} ${2}: no host directory specified for ${3}"
 +    "GIT")	# ONLY USED FOR RETREIVING DRAGONFLY SOURCE FOR BUILDING JAIL
 +		if [ -z "${5}" -o "${5}" = "UNUSED" ]; then
 +		    echo "ERROR: ${1} ${2}: no git branch specified for ${3}"
-+		    exit 1
-+		fi
-+
+ 		    exit 1
+ 		fi
+ 
+-		updateCmd="/usr/local/bin/svn"
+-
+-		if [ ! -x "${updateCmd}" ]; then
+-		    echo "ERROR: ${2} ${3}: ${updateCmd} missing"
 +		updateCmd=/usr/pkg/bin/git
 +		commandTreeChecks ${updateCmd} ${2} ${3}
 +		if [ "$?" -eq "1" ]; then
-+		    exit 1
-+		fi
-+
-+		( echo "#!/bin/sh"
+ 		    exit 1
+ 		fi
+ 
+-		if [ -d ${treeDir} ]; then
+-		    echo "${2}: cleaning out old directories"
+-		    cleanDirs ${2} ${treeDir}
+-		fi
+-
+-		if [ ! -d ${treeDir} ]; then
+-		    echo "${2}: creating top-level directory"
+-		    mkdir -p ${treeDir} >/dev/null 2>&1
+-		fi
+-
+-		case ${1} in
+-		"jail")		treeSubDir="src"
+-		;;
+-		"portstree")	treeSubDir="ports"
+-		;;
+-		esac
+-
+ 		( echo "#!/bin/sh"
+-		  echo "cd ${treeDir}"
+-		  echo "if [ ! -d ${treeDir}/${treeSubDir} ]; then"
+-		  echo "${updateCmd} co ${8}://${4}/${9} ${treeSubDir}"
 +		  echo "echo 'SERVER: ${4}'"
 +		  echo "echo 'BRANCH: ${5}'"
 +		  echo "if [ -d ${treeDir}/src ]; then"
 +		  echo "  cd ${treeDir}/src"
-+		  echo "else"
+ 		  echo "else"
+-		  echo "cd ${treeDir}/${treeSubDir}"
+-		  echo "${updateCmd} up"
 +		  echo "  echo 'Creating shallow source repository.'"
 +		  echo "  mkdir ${treeDir}/src"
 +		  echo "  cd ${treeDir}/src"
@@ -229,7 +263,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +		  echo "  ${updateCmd} fetch --depth=1 origin"
 +		  echo "  ${updateCmd} branch master origin/master"
 +		  echo "  echo 'Repository creation complete.'"
-+		  echo "fi"
+ 		  echo "fi"
 +		  echo "BRANCH=\`${updateCmd} branch | /usr/bin/grep -w ${5}\`"
 +		  echo "if [ \"\${BRANCH}\" = \"\" ]; then"
 +		  echo "  ${updateCmd} branch ${5} origin/${5}"
@@ -237,14 +271,10 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +		  echo "echo 'Ready to pull updates from branch.'"
 +		  echo "${updateCmd} checkout ${5}"
 +		  echo "${updateCmd} pull"
-+		) > ${treeDir}/update.sh
-+		chmod +x ${treeDir}/update.sh
-+		;;
-+
-     *)		echo "ERROR: ${1} ${2}: unknown update type: ${3}"
- 		exit 1;;
- 
-@@ -177,6 +246,15 @@ setupDefaults () {
+ 		) > ${treeDir}/update.sh
+ 		chmod +x ${treeDir}/update.sh
+ 		;;
+@@ -223,6 +246,15 @@ setupDefaults () {
      if [ -z "${defaultUpdateType}" ]; then
          export defaultUpdateType=${_defaultUpdateType}
      fi
@@ -260,7 +290,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  }
  
  tcExists () {
-@@ -211,16 +289,21 @@ updateTree () {
+@@ -257,16 +289,21 @@ updateTree () {
  
      echo "${name}: updating ${what} with ${updateCmd}"
  
@@ -284,7 +314,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  }
  
  #---------------------------------------------------------------------------
-@@ -228,8 +311,8 @@ updateTree () {
+@@ -274,8 +311,8 @@ updateTree () {
  #---------------------------------------------------------------------------
  
  Setup () {
@@ -295,7 +325,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      PREF_FILES="tinderbox.ph"
      README="$(tinderLoc scripts README)"
      TINDERBOX_URL="http://tinderbox.marcuscom.com/"
-@@ -509,7 +592,7 @@ Upgrade () {
+@@ -555,7 +592,7 @@ Upgrade () {
      for jail in ${jails}; do
  	f=$(tinderLoc jail ${jail})
  	ucmd=$(${tc} getUpdateCmd -j ${jail} 2>/dev/null)
@@ -304,7 +334,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    if [ -f "${ucmd}" ]; then
  		mv -f "${ucmd}" "${f}/update.sh"
  		chmod +x "${f}/update.sh"
-@@ -524,11 +607,8 @@ Upgrade () {
+@@ -570,11 +607,8 @@ Upgrade () {
  		    tinderEcho "WARN: You must manually set the update command for ${jail} to \"USER\" using the query ${query}."
  		fi
  	    fi
@@ -318,7 +348,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    ( echo "#!/bin/sh"
  	      echo "${updateCmd} ${f}/supfile"
  	    ) > ${f}/update.sh
-@@ -542,7 +622,7 @@ Upgrade () {
+@@ -588,7 +622,7 @@ Upgrade () {
      for portstree in ${portstrees}; do
  	f=$(tinderLoc portstree ${portstree})
  	ucmd=$(${tc} getUpdateCmd -p ${portstree} 2>/dev/null)
@@ -327,7 +357,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    if [ -f "${ucmd}" ]; then
  		mv -f "${ucmd}" "${f}/update.sh"
  		chmod +x "${f}/update.sh"
-@@ -557,17 +637,14 @@ Upgrade () {
+@@ -603,17 +637,14 @@ Upgrade () {
  		    tinderEcho "WARN: You must manually set the update command for ${portstree} to \"USER\" using the query ${query}."
  		fi
  	    fi
@@ -349,7 +379,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    fi
  	fi
      done
-@@ -741,38 +818,55 @@ buildJail () {
+@@ -787,38 +818,55 @@ buildJail () {
  	return 1
      fi
  
@@ -422,18 +452,19 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
          rc=$?
          execute_hook "postJailBuild" "JAIL=${jailName} DESTDIR=${J_TMPDIR} JAIL_ARCH=${jailArch} MY_ARCH=${myArch} JAIL_OBJDIR=${JAIL_OBJDIR} SRCBASE=${SRCBASE} PB=${pb} RC=${rc}"
          if [ ${rc} -ne 0 ]; then
-@@ -783,21 +877,80 @@ buildJail () {
+@@ -829,21 +877,80 @@ buildJail () {
          # Make a complete distribution
          echo "${jailName}: making distribution"
  
 -        # determine if we're cross-building world
 -        crossEnv=""
 -        if [ "${jailArch}" != "${myArch}" ]; then
--	    crossEnv="TARGET_ARCH=${jailArch} MACHINE_ARCH=${jailArch} MAKEOBJDIRPREFIX=${J_OBJDIR}/${jailArch} MACHINE=${jailArch}"
+-	    crossEnv="TARGET_ARCH=${jailArch}"
 -        fi
--        cd ${SRCBASE}/etc && env DESTDIR=${J_TMPDIR} ${crossEnv} \
+-        cd ${SRCBASE} && env DESTDIR=${J_TMPDIR} ${crossEnv} \
+-	    make distribution > ${jailBase}/distribution.tmp 2>&1
 +        cd ${SRCBASE}/etc && env DESTDIR=${J_TMPDIR} \
- 	    make -m ${J_TMPDIR}/usr/share/mk distribution > ${jailBase}/distribution.tmp 2>&1
++	    make -m ${J_TMPDIR}/usr/share/mk distribution > ${jailBase}/distribution.tmp 2>&1
          if [ $? -ne 0 ]; then
  	    echo "ERROR: distribution failed - see ${jailBase}/distribution.tmp"
  	    buildJailCleanup 1 ${jailName} ${J_SRCDIR}
@@ -510,7 +541,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      MTREE_DIR=${SRCBASE}/etc/mtree
      mtree -deU -f ${MTREE_DIR}/BSD.root.dist \
-@@ -809,11 +962,8 @@ buildJail () {
+@@ -855,11 +962,8 @@ buildJail () {
      mtree -deU -f ${MTREE_DIR}/BSD.local.dist \
  	  -p ${J_TMPDIR}/usr/local >/dev/null 2>&1
  
@@ -522,7 +553,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      # Create the jail tarball
      echo "${jailName}: creating tarball"
      jailDir=$(tinderLoc jail ${jailName})
-@@ -827,7 +977,7 @@ buildJail () {
+@@ -873,7 +977,7 @@ buildJail () {
      fi
  
      # Move new logfiles into place
@@ -531,8 +562,12 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      do
  	rm -f ${jailBase}/${logfile}.log
  	mv -f ${jailBase}/${logfile}.tmp ${jailBase}/${logfile}.log 2>/dev/null
-@@ -883,22 +1033,22 @@ createJail () {
+@@ -927,29 +1031,25 @@ createJail () {
+     jailArch=$(uname -m)
+     mountSrc=""
      init=1
+-    protocol=""
+-    updateHostDirectory=""
  
      setupDefaults
 -    updateHost=${defaultUpdateHost}
@@ -542,7 +577,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +    updateType=${defaultDragonType}
  
      # argument handling
--    while getopts a:d:j:m:t:u:CH:I arg >/dev/null 2>&1
+-    while getopts a:d:j:m:t:u:CD:H:IP: arg >/dev/null 2>&1
 +    while getopts d:j:m:t:u:H:I arg >/dev/null 2>&1
      do
  	case "${arg}" in
@@ -554,13 +589,16 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	t)	updateTag="${OPTARG}";;
  	u)	updateType="${OPTARG}";;
 -	C)	updateCompress=1;;
+-	D)	updateHostDirectory="${OPTARG}";;
 -	H)	updateHost="${OPTARG}";;
 +	H)	updateHostISO="${OPTARG}"
 +		updateHostSRC="${OPTTAG}";;
  	I)	init=0;;
+-	P)	protocol="${OPTARG}";;
  	?)	return 1;;
  
-@@ -913,7 +1063,7 @@ createJail () {
+ 	esac
+@@ -963,7 +1063,7 @@ createJail () {
  
      valid=$(echo ${jailName} | awk '{if (/^[[:digit:]]/) {print;}}')
      if [ -z "${valid}" ]; then
@@ -569,7 +607,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	return 1
      fi
  
-@@ -927,6 +1077,17 @@ createJail () {
+@@ -977,10 +1077,20 @@ createJail () {
  	return 1
      fi
  
@@ -586,11 +624,18 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +
      echo "${jailName}: initializing tree"
      generateUpdateCode jail ${jailName} ${updateType} ${updateHost} \
- 		       ${updateTag} ${updateCompress} ${jailArch}
-@@ -1040,20 +1201,21 @@ createPortsTree () {
+-		       ${updateTag} ${updateCompress} ${jailArch} \
+-		       ${protocol} ${updateHostDirectory}
++		       ${updateTag} ${updateCompress} ${jailArch}
+ 
+     echo -n "${jailName}: adding to datastore... "
+ 
+@@ -1091,28 +1201,25 @@ createPortsTree () {
      init=1
      mountSrc=""
      portsTreeName=""
+-    protocol=""
+-    updateHostDirectory=""
 +    cvsTag="."
  
      setupDefaults
@@ -598,7 +643,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      updateType=${defaultUpdateType}
  
      # argument handling
--    while getopts d:m:p:u:w:CH:I arg >/dev/null 2>&1
+-    while getopts d:m:p:u:w:CD:H:IP: arg >/dev/null 2>&1
 +    while getopts d:m:t:p:w:CH:I arg >/dev/null 2>&1
      do
  	case "${arg}" in
@@ -610,8 +655,14 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +	t)	cvsTag="${OPTARG}";;
  	w)	cvswebUrl="${OPTARG}";;
  	C)	updateCompress=1;;
+-	D)	updateHostDirectory="${OPTARG}";;
  	H)	updateHost="${OPTARG}";;
-@@ -1079,9 +1241,15 @@ createPortsTree () {
+ 	I)	init=0;;
+-	P)	protocol="${OPTARG}";;
+ 	?)	return 1;;
+ 
+ 	esac
+@@ -1134,10 +1241,15 @@ createPortsTree () {
  	return 1
      fi
  
@@ -623,12 +674,13 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
 +
      echo "${portsTreeName}: initializing tree"
      generateUpdateCode portstree ${portsTreeName} ${updateType} \
--		       ${updateHost} "." ${updateCompress}
+-		       ${updateHost} "." ${updateCompress} "" \
+-		       ${protocol} ${updateHostDirectory}
 +		       ${updateHost} ${cvsTag} ${updateCompress}
  
      # add portstree to datastore
      echo -n "${portsTreeName}: adding to datastore... "
-@@ -1158,7 +1326,7 @@ enterBuild () {
+@@ -1214,7 +1326,7 @@ enterBuild () {
      fi
  
      sleepName=$(echo ${portDir} | sed -e 'y/\//_/')
@@ -637,7 +689,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      if [ ! -d ${portFullDir} ]; then
  	echo "enterBuild: Build environment does not exist yet, sleeping."
-@@ -1182,7 +1350,7 @@ enterBuild () {
+@@ -1238,7 +1350,7 @@ enterBuild () {
  	sleep 15
      done
  
@@ -646,7 +698,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      cp $(tinderLoc scripts lib/enterbuild) ${buildRoot}/root
      chroot ${buildRoot} /root/enterbuild ${portDir}
      rm -f ${buildRoot}/tmp/.sleep_${sleepName}
-@@ -1269,7 +1437,6 @@ makeBuild () {
+@@ -1325,7 +1437,6 @@ makeBuild () {
  resetBuild () {
      # set up defaults
      build=""
@@ -654,7 +706,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      cleandistfiles="0"
  
      # argument handling
-@@ -1278,7 +1445,6 @@ resetBuild () {
+@@ -1334,7 +1445,6 @@ resetBuild () {
  	case "${arg}" in
  
  	b)	build="${OPTARG}";;
@@ -662,7 +714,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	?)	exit 1;;
  
  	esac
-@@ -1434,22 +1600,23 @@ tinderbuild_setup () {
+@@ -1490,22 +1600,23 @@ tinderbuild_setup () {
      echo "tinderbuild: Finalizing chroot environment"
  
      # Mount ports/
@@ -691,7 +743,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      # Mount /dev, since we're going to be chrooting shortly
      mount -t devfs devfs ${buildRoot}/dev >/dev/null 2>&1
-@@ -1466,12 +1633,6 @@ tinderbuild_setup () {
+@@ -1522,12 +1633,6 @@ tinderbuild_setup () {
  	tinderbuild_cleanup 1
      fi
  
@@ -704,7 +756,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      # Handle the distfile cache
      if [ -n "${DISTFILE_CACHE}" ]; then
  	if ! requestMount -t builddistcache -b ${build} \
-@@ -1501,7 +1662,7 @@ tinderbuild_setup () {
+@@ -1557,7 +1662,7 @@ tinderbuild_setup () {
  	mkdir -p ${ccacheDir} $(tinderLoc buildccache ${build})
  
  	if ! requestMount -t buildccache -b ${build} \
@@ -713,7 +765,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    echo "tinderbuild: cannot mount ccache"
  	    tinderbuild_cleanup 1
  	fi
-@@ -1518,8 +1679,7 @@ tinderbuild_setup () {
+@@ -1574,8 +1679,7 @@ tinderbuild_setup () {
  
  	mkdir -p ${optionsDir} $(tinderLoc buildoptions ${build})
  
@@ -723,7 +775,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    echo "tinderbuild: cannot mount options"
  	    tinderbuild_cleanup 1
  	fi
-@@ -1602,10 +1762,9 @@ tinderbuild () {
+@@ -1658,10 +1762,9 @@ tinderbuild () {
      cleanpackages=0
      init=0
      jobs=1
@@ -735,7 +787,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      pbargs=""
      skipmake=0
      updateports=0
-@@ -1652,9 +1811,8 @@ tinderbuild () {
+@@ -1708,9 +1811,8 @@ tinderbuild () {
  	x-fetch-original)	pbargs="${pbargs} -fetch-original";;
  	x-noclean)		pbargs="${pbargs} -noclean";;
  	x-nolog)		pbargs="${pbargs} -nolog";;
@@ -746,7 +798,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
  	-*)			return 1;;
  	*)			ports="${ports} $1";;
-@@ -1780,7 +1938,8 @@ tinderbuild () {
+@@ -1836,7 +1938,8 @@ tinderbuild () {
  		echo "tinderbuild: cannot mount portstree: ${portstree}"
  		exit 1
  	    fi
@@ -756,7 +808,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  		$(tinderLoc scripts lib/makemake) ${noduds} ${build} ${ports}
  	)
  	if [ $? -ne 0 ]; then
-@@ -1799,10 +1958,6 @@ tinderbuild () {
+@@ -1855,10 +1958,6 @@ tinderbuild () {
  
      # Set up the chrooted environment
      osmajor=$(echo ${jail} | sed -E -e 's|(^[[:digit:]]+).*$|\1|')
@@ -767,7 +819,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      tinderbuild_setup
  
-@@ -1810,7 +1965,7 @@ tinderbuild () {
+@@ -1866,7 +1965,7 @@ tinderbuild () {
      ${tc} updateBuildStatus -b ${build} -s PORTBUILD
      tinderbuild_phase 0 ${jobs} ${pkgDir}
      error=$?
@@ -776,7 +828,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	if [ ${error} -ne 0 ] ; then
  	    tinderbuild_setup
  	fi
-@@ -1829,21 +1984,46 @@ init () {
+@@ -1885,21 +1984,46 @@ init () {
  	mkdir -p ${pb}/${dir}
      done
  
@@ -829,7 +881,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      return 0
  }
-@@ -1892,7 +2072,8 @@ addPortToBuild () {
+@@ -1948,7 +2072,8 @@ addPortToBuild () {
      buildenv ${jail} ${portsTree} ${build}
      buildenvNoHost ${build}
  
@@ -839,7 +891,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
      if [ -z "${portDir}" ]; then
  	${tc} addPortToOneBuild -b ${build} ${norecurse}
      else
-@@ -1902,36 +2083,7 @@ addPortToBuild () {
+@@ -1958,36 +2083,7 @@ addPortToBuild () {
          fi
          ${tc} addPortToOneBuild -b ${build} -d ${portDir} ${norecurse}
      fi
@@ -877,7 +929,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      if [ -n "${save_SRCBASE}" ]; then
  	export SRCBASE=${save_SRCBASE}
-@@ -2118,10 +2270,7 @@ copyBuild () {
+@@ -2174,10 +2270,7 @@ copyBuild () {
  		if [ ! -d ${destOptionsDir} ]; then
  		    mkdir -p ${destOptionsDir}
  		fi
@@ -889,7 +941,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    else
  		echo "copyBuild: not copying OPTIONS to ${dest} since it has no OPTIONS directory"
  	    fi
-@@ -2237,13 +2386,13 @@ tbcleanup () {
+@@ -2293,13 +2386,13 @@ tbcleanup () {
  	pathFound=0
          for portstree in ${portstrees} ; do
  	    path=$(tinderLoc portstree ${portstree})
@@ -906,7 +958,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00:20 marino Exp $
  		    if [ -f "${distinfo}" ]; then
  			for df in $(grep '^MD5' ${distinfo} | awk -F '[\(\)]' '{print $2}'); do
  			    if ! grep -q "^${df}\$" ${disttmp}; then
-@@ -2327,7 +2476,7 @@ tbcleanup () {
+@@ -2383,7 +2476,7 @@ tbcleanup () {
  	    fi
  
  	    path=$(tinderLoc portstree ${portstree})
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-ag b/pkgtools/tinderbox-dragonfly/patches/patch-ag
deleted file mode 100644
index 3f0dd413402..00000000000
--- a/pkgtools/tinderbox-dragonfly/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/11/02 21:13:22 marino Exp $
-
---- ../FreeBSD/sql/values.lp	2011-10-16 00:52:55.000000000 +0000
-+++ sql/values.lp
-@@ -1,4 +1,4 @@
--INSERT INTO logfile_patterns VALUES ( 10, 'File not found', 'error', '/^(?!fetch).*No such file or directory/', 'Red' );
-+INSERT INTO logfile_patterns VALUES ( 10, 'File not found', 'error', '/^(?!(fetch|.*\sconftest\*:)).*No such file or directory/', 'Red' );
- INSERT INTO logfile_patterns VALUES ( 500, 'Declaration prototype', 'warning', '/warning: function declaration isn''t a prototype/', 'Violet' );
- INSERT INTO logfile_patterns VALUES ( 510, 'No prototype', 'warning', '/warning: no previous prototype for ''.*''/', 'Violet' );
- INSERT INTO logfile_patterns VALUES ( 520, 'Implicit function', 'warning', '/warning: implicit declaration of function ''.*''/', 'Magenta' );
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-ah b/pkgtools/tinderbox-dragonfly/patches/patch-ah
deleted file mode 100644
index a35ae0f17b2..00000000000
--- a/pkgtools/tinderbox-dragonfly/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/11/14 02:00:20 marino Exp $
-
---- ../FreeBSD/webui/core/TinderboxDS.php	2011-10-16 00:52:55.000000000 +0000
-+++ webui/core/TinderboxDS.php
-@@ -420,7 +420,7 @@
-                 $query .= " AND p.port_name LIKE '%" . $this->db->escape( $port_name, TRUE ) . "%'";
-             $query .= " ORDER BY " . $this->db->escape( $sortbytable ) . "." . $this->db->escape( $sortby );
-             if( $limit != 0 )
--                $query .= " LIMIT " . $this->db->escape( $limit_offset, TRUE ) . "," .  $this->db->escape( $limit, TRUE );
-+                $query .= " LIMIT " . $this->db->escape( $limit, TRUE ) . " OFFSET " . $this->db->escape( $limit_offset, TRUE );
- 
-             $rc = $this->_doQueryHashRef($query, $results, $build->getId());
- 
-@@ -533,7 +533,7 @@
-                  $query .= "AND p.port_maintainer='" . $this->db->escape( $maintainer, TRUE ) . "' ";
-             $query .= " ORDER BY " . $this->db->escape( $sortbytable ) . "." . $this->db->escape( $sortby );
-             if( $limit != 0 )
--                 $query .= " LIMIT " . $this->db->escape( $limit_offset ) . "," . $limit;
-+                 $query .= " LIMIT " . $this->db->escape( $limit, TRUE ) . " OFFSET " . $this->db->escape( $limit_offset, TRUE );
- 
-             $rc = $this->_doQueryHashRef($query, $results, array());
- 
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-ai b/pkgtools/tinderbox-dragonfly/patches/patch-ai
index 719a6d37434..ce7f6b7219e 100644
--- a/pkgtools/tinderbox-dragonfly/patches/patch-ai
+++ b/pkgtools/tinderbox-dragonfly/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
+$NetBSD: patch-ai,v 1.3 2011/11/20 16:20:24 marino Exp $
 
 --- ../FreeBSD/lib/portbuild	2011-10-16 00:52:55.000000000 +0000
 +++ lib/portbuild
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  	fi
      fi
  
-@@ -56,7 +54,12 @@ mark_failed() {
+@@ -56,13 +54,19 @@ mark_failed() {
  	return
      fi
  
@@ -51,7 +51,14 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
      if [ $? -ne 0 ]; then
  	return
      fi
-@@ -71,7 +74,6 @@ mark_failed() {
+ 
+     for dep in ${dependents}; do
+ 	${tc} updatePortStatus -d ${dep} -b ${branch} -L -s DEPEND -p ${portdir}
++	execute_hook "postPortBuild" "PACKAGE_NAME=${pkgname} BUILD=${branch} JAIL=${jail} PORTSTREE=${portstree} CHROOT=${chroot} PORTDIR=${dep} PB=${pb} STATUS=DEPEND FAIL_REASON=DEPEND TOTAL_SIZE=0"
+     done
+ }
+ 
+@@ -71,7 +75,6 @@ mark_failed() {
  error=0
  init=0
  noclean=0
@@ -59,7 +66,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  fetchorig=0
  nolog=0
  plistcheck=""
-@@ -107,9 +109,6 @@ while [ $# -gt 0 -a ${doneargs} -eq 0 ];
+@@ -107,9 +110,6 @@ while [ $# -gt 0 -a ${doneargs} -eq 0 ];
      x-plistcheck)	plistcheck="plistcheck"
  			shift;;
  
@@ -69,7 +76,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
      x-fetch-original)	fetchorig=1
  			shift;;
  
-@@ -151,7 +150,7 @@ echo ${dirname}
+@@ -151,7 +151,7 @@ echo ${dirname}
  tc=$(tinderLoc scripts tc)
  chroot=$(tinderLoc buildroot ${build})
  echo "chroot is: ${chroot}"
@@ -78,7 +85,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  
  total_size=$(${tc} getPortTotalSize -d ${portdir} -b ${build})
  execute_hook "prePortBuild" "PACKAGE_NAME=${pkgname} BUILD=${build} JAIL=${jail} PORTSTREE=${portstree} CHROOT=${chroot} PORTDIR=${portdir} PB=${pb} TOTAL_SIZE=${total_size}"
-@@ -167,7 +166,7 @@ if [ -f ${dudsfile} ]; then
+@@ -167,7 +167,7 @@ if [ -f ${dudsfile} ]; then
      if grep -qxF ${pkgname} ${dudsfile}; then
          echo "skipping ${pkgname} (found in duds)"
  	${tc} updatePortStatus -d ${portdir} -b ${build} \
@@ -87,7 +94,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  	mark_failed ${tc} ${build} ${pkgname} ${portdir}
  	execute_hook "postPortBuild" "PACKAGE_NAME=${pkgname} BUILD=${build} JAIL=${jail} PORTSTREE=${portstree} CHROOT=${chroot} STATUS=DUD PORTDIR=${portdir} PB=${pb} FAIL_REASON=dud TOTAL_SIZE=0"
          exit 1
-@@ -175,12 +174,12 @@ if [ -f ${dudsfile} ]; then
+@@ -175,12 +175,12 @@ if [ -f ${dudsfile} ]; then
  fi
  
  # directories to clean
@@ -101,7 +108,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  
  # reset mtrees for plist checking
  mtree -deU -f ${chroot}/etc/mtree/BSD.root.dist \
-@@ -190,17 +189,48 @@ mtree -deU -f ${chroot}/etc/mtree/BSD.va
+@@ -190,17 +190,48 @@ mtree -deU -f ${chroot}/etc/mtree/BSD.va
  mtree -deU -f ${chroot}/etc/mtree/BSD.usr.dist \
        -p ${chroot}/usr >/dev/null 2>&1
  
@@ -155,7 +162,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
      mkdir -p ${chroot}/compat/linux/proc
      mount -t linprocfs linprocfs ${chroot}/compat/linux/proc
  fi
-@@ -251,8 +281,10 @@ if [ x"${CCACHE_ENABLED}" = x"1" ]; then
+@@ -251,8 +282,10 @@ if [ x"${CCACHE_ENABLED}" = x"1" ]; then
      export PATH=/opt:${PATH}
  fi
  
@@ -168,7 +175,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  fi
  
  echo "building $pkgname in $chroot"
-@@ -264,11 +296,7 @@ packages=$(tinderLoc packages ${build})
+@@ -264,11 +297,7 @@ packages=$(tinderLoc packages ${build})
  major_version=$(echo ${jail} | sed -E -e 's|(^[[:digit:]]+).*$|\1|')
  
  if [ -n "${DISTFILE_CACHE}" ]; then
@@ -181,7 +188,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  fi
  
  if [ -n "${DISTFILE_URI}" ]; then
-@@ -282,7 +310,7 @@ mkdir -p ${chroot}/tmp/depends ${chroot}
+@@ -282,7 +311,7 @@ mkdir -p ${chroot}/tmp/depends ${chroot}
  echo "building ${pkgname} in directory ${chroot}" | \
      tee ${chroot}/tmp/${pkgname}.log
  
@@ -190,7 +197,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  
  # Don't build in a world-writable standard directory because some ports
  # hardcode this path and try to load things from it at runtime, which is
-@@ -294,7 +322,7 @@ if [ x"${CCACHE_ENABLED}" ]; then
+@@ -294,7 +323,7 @@ if [ x"${CCACHE_ENABLED}" ]; then
      unset CCACHE_DISABLE
  fi
  
@@ -199,7 +206,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  ldconfig_dirs=""
  for i in ${_ldconfig_dirs}; do
      if [ -d ${chroot}/${i} ]; then
-@@ -302,9 +330,6 @@ for i in ${_ldconfig_dirs}; do
+@@ -302,9 +331,6 @@ for i in ${_ldconfig_dirs}; do
      fi
  done
  chroot ${chroot} /sbin/ldconfig ${ldconfig_dirs}
@@ -209,7 +216,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  
  set x $ED $FD $PD $BD $RD $TD
  shift 1
-@@ -337,7 +362,7 @@ if [ $? -ne 0 ]; then
+@@ -337,7 +363,7 @@ if [ $? -ne 0 ]; then
      exit 1
  fi
  
@@ -218,7 +225,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  if [ -f ${chroot}/tmp/status ]; then
      error=$(cat ${chroot}/tmp/status)
  else
-@@ -351,14 +376,7 @@ errorsDir=$(tinderLoc builderrors ${buil
+@@ -351,14 +377,7 @@ errorsDir=$(tinderLoc builderrors ${buil
  
  if [ "${error}" = "0" ]; then
      ln -sf ${pkgname}.log2 ${chroot}/tmp/make.log
@@ -234,7 +241,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      grep pnohang ${chroot}/tmp/${pkgname}.log2
      cat ${chroot}/tmp/${pkgname}.log2 >> ${chroot}/tmp/${pkgname}.log
-@@ -372,6 +390,7 @@ if [ "${error}" = "0" ]; then
+@@ -372,6 +391,7 @@ if [ "${error}" = "0" ]; then
          cp ${chroot}/tmp/${pkgname}.log ${logsDir}/${pkgname}.log
      fi
      if [ -n "${logdir}" ]; then
@@ -242,7 +249,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  	if [ ${docopy} -eq 1 ]; then
  	    cp ${logsDir}/${pkgname}.log${lext} ${logdir}/${pkgname}.log${lext}
  	else
-@@ -388,6 +407,7 @@ if [ "${error}" = "0" ]; then
+@@ -388,6 +408,7 @@ if [ "${error}" = "0" ]; then
  	cp ${chroot}/tmp/work.tbz ${workDir}/${pkgname}.tbz
      fi
  
@@ -250,7 +257,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
      if [ "${error}" = "0" ]; then
          if [ ! -z "${last_version}" ]; then
  	    oldpkgs=$(find ${packages} -name "${last_version}${PKGSUFFIX}")
-@@ -400,8 +420,8 @@ if [ "${error}" = "0" ]; then
+@@ -400,8 +421,8 @@ if [ "${error}" = "0" ]; then
  		tar --unlink -C ${packages} -xvf -
  	[ -f ${packages}/All/${pkgname}${PKGSUFFIX} ] && \
  		touch ${packages}/All/${pkgname}${PKGSUFFIX}
@@ -261,7 +268,7 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00:20 marino Exp $
  	    status="BROKEN"
  	elif [ -f ${chroot}/tmp/leftovers ]; then
  	    status="LEFTOVERS"
-@@ -476,5 +496,5 @@ else
+@@ -476,5 +497,5 @@ else
      execute_hook "postPortBuild" "PACKAGE_NAME=${pkgname} BUILD=${build} JAIL=${jail} PORTSTREE=${portstree} CHROOT=${chroot} STATUS=FAIL PORTDIR=${portdir} PB=${pb} ${reasonenv} TOTAL_SIZE=${total_size}"
  fi
  
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-ar b/pkgtools/tinderbox-dragonfly/patches/patch-ar
index 35dec91c39b..496c97c8107 100644
--- a/pkgtools/tinderbox-dragonfly/patches/patch-ar
+++ b/pkgtools/tinderbox-dragonfly/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.2 2011/11/14 02:00:20 marino Exp $
+$NetBSD: patch-ar,v 1.3 2011/11/20 16:20:24 marino Exp $
 
---- ../FreeBSD/README	2011-10-30 17:11:08.876006000 +0000
+--- ../FreeBSD/README	2011-11-20 13:18:28.333065000 +0000
 +++ README
 @@ -2,23 +2,30 @@
  
@@ -57,8 +57,8 @@ $NetBSD: patch-ar,v 1.2 2011/11/14 02:00:20 marino Exp $
 -   Recent FreeBSD (development happens on 9-CURRENT only, but
 -   Tinderbox is known to work on RELENG_7 and RELENG_8 too), Perl 5.8
 -   or later (lang/perl5.8), and either MySQL 4.1 or later
--   (databases/mysql41-server) or PostgreSQL 7.4 or later
--   (databases/postgres74-server).
+-   (databases/mysql41-server) or PostgreSQL 8.2 or later
+-   (databases/postgresql82-server).
 +   Recent DragonFly, Perl 5.8 or later (lang/perl5), and either 
 +   MySQL 5.0 or later (databases/mysql51-server) or 
 +   PostgreSQL 8.4 or later (databases/postgres84-server).
@@ -69,9 +69,9 @@ $NetBSD: patch-ar,v 1.2 2011/11/14 02:00:20 marino Exp $
 +   (databases/p5-DBD-mysql). If PostgreSQL is used, the Pg Perl
 +   module must also be installed (databases/p5-DBD-postgresql).
  
--   Please note, however, that is is recommended that either MySQL 5.0
--   or PostgreSQL 8.1 (or later) be used. There are currently no plans
--   to make this a requirement, but it may happen in the future.
+-     Note: Please note, however, that is is recommended that for
+-     MySQL version 5.0 or later be used. There are currently no plans
+-     to make this a requirement, but it may happen in the future.
 -
 -   PHP 4.x is now EOL, so the web front-end (found in the webui/
 -   subdirectory) requires PHP 5 (lang/php5), PEAR::MDB2_Driver_mysql
@@ -546,15 +546,6 @@ $NetBSD: patch-ar,v 1.2 2011/11/14 02:00:20 marino Exp $
  
      2. Install dependencies into the jail (Chapter 2).
  
-@@ -919,7 +936,7 @@
- 
-  # mkdir ${pb}
-  # cd ${pb} && \
--         fetch -o - path_to_tinderbox-3.3.tar.gz | \
-+         fetch -o - path_to_tinderbox-3.4.tar.gz | \
-          tar xvf -
- 
-     4. Now we need to leave the jail, and on the host system chroot
 @@ -938,7 +955,6 @@
   tinderd_enable="YES"
   tinderd_chroot="${jail_dir}"
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-as b/pkgtools/tinderbox-dragonfly/patches/patch-as
index 5fdb2023b5d..29000e2d000 100644
--- a/pkgtools/tinderbox-dragonfly/patches/patch-as
+++ b/pkgtools/tinderbox-dragonfly/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
+$NetBSD: patch-as,v 1.3 2011/11/20 16:20:24 marino Exp $
 
---- ../FreeBSD/lib/tc_command.pl	2011-10-16 00:52:55.000000000 +0000
+--- ../FreeBSD/lib/tc_command.pl	2011-11-20 13:05:28.355724000 +0000
 +++ lib/tc_command.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
@@ -12,7 +12,7 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
                  help =>
                      "Add a jail to the datastore (do NOT call this directly; use createJail instead)",
                  usage =>
--                    "-j <jail name> -u CSUP|CVSUP|LFTP|USER|NONE -t <jail tag> [-d <jail description>] [-m <src mount source>] [-a <arch>]",
+-                    "-j <jail name> -u CSUP|CVSUP|LFTP|SVN|USER|NONE -t <jail tag> [-d <jail description>] [-m <src mount source>] [-a <arch>]",
 +                    "-j <jail name> -u GIT|RELEASE|SNAPSHOT|USER|NONE -t <jail tag> [-d <jail description>] [-m <src mount source>] [-a <arch>]",
                  optstr => 'm:j:t:u:d:a:',
          },
@@ -20,7 +20,7 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
                  func => \&addPortsTree,
                  help => "Add a portstree to the datastore",
                  usage =>
--                    "-p <portstree name> -u CSUP|CVSUP|USER|NONE [-d <portstree description>] [-m <ports mount source>] [-w <CVSweb URL>]",
+-                    "-p <portstree name> -u CSUP|CVSUP|SVN|USER|NONE [-d <portstree description>] [-m <ports mount source>] [-w <CVSweb URL>]",
 -                optstr => 'm:p:u:d:w:',
 +                    "-p <portstree name> [-t <cvs tag>] [-d <portstree description>] [-m <ports mount source>] [-w <CVSweb URL>]",
 +                optstr => 'm:p:u:t:d:w:',
@@ -49,8 +49,8 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
          "createJail" => {
                  help => "Create a new jail",
                  usage =>
--                    "-j <jailname> -u CSUP|CVSUP|LFTP|USER|NONE [-t <tag>] [-d <description>] [-C] [-H <updatehost>] [-m <mountsrc>] [-I] [-a <arch>]",
--                optstr => 'j:t:d:CH:m:u:Ia:',
+-                    "-j <jailname> -u CSUP|CVSUP|LFTP|SVN|USER|NONE [-t <tag>] [-d <description>] [-C] [-P <protocol>] [-H <updatehost>] [-D <updatehostdirectory>] [-m <mountsrc>] [-I] [-a <arch>]",
+-                optstr => 'j:t:d:CP:H:D:m:u:Ia:',
 +                    "-j <jailname> -u GIT|RELEASE|SNAPSHOT|USER|NONE -t <tag> [-d <description>] [-H <updatehost>] [-m <mountsrc>] [-I]",
 +                optstr => 'j:t:d:H:m:u:I:',
          },
@@ -58,8 +58,8 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
          "createPortsTree" => {
                  help => "Create a new portstree",
                  usage =>
--                    "-p <portstreename> -u CSUP|CVSUP|USER|NONE [-d <description>] [-C] [-H <updatehost>] [-m <mountsrc>] [-w <cvsweburl>] [-I]",
--                optstr => 'p:d:CH:Im:u:w:',
+-                    "-p <portstreename> -u CSUP|CVSUP|SVN|USER|NONE [-d <description>] [-C] [-P <protocol>] [-H <updatehost>] [-D <updatehostdirectory>] [-m <mountsrc>] [-w <cvsweburl>] [-I]",
+-                optstr => 'p:d:CP:H:Im:u:w:',
 +                    "-p <portstreename> [-t <cvs tag>] [-d <description>] [-C] [-H <updatehost>] [-m <mountsrc>] [-w <cvsweburl>] [-I]",
 +                optstr => 'p:t:d:CH:Im:u:w:',
          },
@@ -91,24 +91,70 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
          },
  
          "copyBuild" => {
-@@ -1489,7 +1496,7 @@ sub addPortsTree {
+@@ -1489,8 +1496,18 @@ sub addPortsTree {
  sub addPortToOneBuild {
          my $build = $ds->getBuildByName($opts->{'b'});
          my $makecache =
 -            new Tinderbox::MakeCache($ENV{'PORTSDIR'}, $ENV{'PKGSUFFIX'});
 +            new Tinderbox::MakeCache($ENV{'PORTSDIR'}, $ENV{'OPTNFILE'});
          my @bports = ();
++        my %oper_hash = (
++            EXTRACT_DEPENDS => 'ExtractDepends',
++            PATCH_DEPENDS   => 'PatchDepends',
++            FETCH_DEPENDS   => 'FetchDepends',
++            BUILD_DEPENDS   => 'BuildDepends',
++            LIB_DEPENDS     => 'LibDepends',
++            RUN_DEPENDS     => 'RunDepends',
++            TEST_DEPENDS    => 'TestDepends',
++            DEPENDS         => 'Buildlink3Depends',
++        );
  
          if (!$opts->{'d'}) {
-@@ -1524,6 +1531,7 @@ sub addPortToOneBuild {
-                                 LIB_DEPENDS     => 'LibDepends',
-                                 RUN_DEPENDS     => 'RunDepends',
-                                 TEST_DEPENDS    => 'TestDepends',
-+                                DEPENDS         => 'Buildlink3Depends',
-                         );
+                 foreach my $port ($ds->getPortsForBuild($build)) {
+@@ -1502,7 +1519,25 @@ sub addPortToOneBuild {
+ 
+         if ($opts->{'R'}) {
+                 foreach my $pdir (@bports) {
+-                        addPorts($pdir, $build, $makecache, undef);
++                        my $pCls = addPorts($pdir, $build, $makecache, undef);
++                        $ds->clearDependenciesForPort($pCls, $build, undef);
++                        foreach my $deptype (keys %oper_hash) {
++                                my $oper = $oper_hash{$deptype};
++                                foreach my $dn ($makecache->$oper($pdir)) {
++                                        my $dep = $ds->getPortByDirectory($dn);
++                                        next if (!defined($dep));
++                                        if (
++                                                !$ds->addDependencyForPort(
++                                                        $pCls,    $build,
++                                                        $deptype, $dep
++                                                )
++                                            )
++                                        {
++                                                warn "WARN: Failed to add $deptype entry for $pdir: "
++                                                    . $ds->getError() . "\n";
++                                        }
++                                }
++                        }
+                 }
+         } else {
+                 my @deps = @bports;
+@@ -1516,15 +1551,6 @@ sub addPortToOneBuild {
+                 }
+                 foreach my $port (keys %seen) {
+                         my $pCls      = $seen{$port};
+-                        my %oper_hash = (
+-                                EXTRACT_DEPENDS => 'ExtractDepends',
+-                                PATCH_DEPENDS   => 'PatchDepends',
+-                                FETCH_DEPENDS   => 'FetchDepends',
+-                                BUILD_DEPENDS   => 'BuildDepends',
+-                                LIB_DEPENDS     => 'LibDepends',
+-                                RUN_DEPENDS     => 'RunDepends',
+-                                TEST_DEPENDS    => 'TestDepends',
+-                        );
  
                          $ds->clearDependenciesForPort($pCls, $build, undef);
-@@ -1548,7 +1556,6 @@ sub addPortToOneBuild {
+ 
+@@ -1548,7 +1574,6 @@ sub addPortToOneBuild {
                                  }
                          }
                  }
@@ -116,7 +162,7 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
          }
  }
  
-@@ -1600,7 +1607,7 @@ sub addBuildPortsQueueEntry {
+@@ -1600,7 +1625,7 @@ sub addBuildPortsQueueEntry {
                      $ds->addBuildPortsQueueEntry($build, $portdir, $priority,
                          $user_id);
                  if (!$rc) {
@@ -125,7 +171,7 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
                                      . $portdir
                                      . " to the datastore: "
                                      . $ds->getError()
-@@ -1720,6 +1727,7 @@ sub getDependenciesForPort {
+@@ -1720,6 +1745,7 @@ sub getDependenciesForPort {
                  LIB_DEPENDS     => 4,
                  RUN_DEPENDS     => 5,
                  TEST_DEPEND     => 6,
@@ -133,7 +179,7 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00:20 marino Exp $
          );
  
          if (!$opts->{'b'} || !$opts->{'d'}) {
-@@ -1773,6 +1781,50 @@ sub getDependenciesForPort {
+@@ -1773,6 +1799,50 @@ sub getDependenciesForPort {
                  );
          }
  }
diff --git a/pkgtools/tinderbox-dragonfly/patches/patch-aw b/pkgtools/tinderbox-dragonfly/patches/patch-aw
index 7e4f7e040f8..f253be0180b 100644
--- a/pkgtools/tinderbox-dragonfly/patches/patch-aw
+++ b/pkgtools/tinderbox-dragonfly/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
+$NetBSD: patch-aw,v 1.3 2011/11/20 16:20:24 marino Exp $
 
 --- ../FreeBSD/lib/Tinderbox/MakeCache.pm	2011-10-16 00:52:55.000000000 +0000
 +++ lib/Tinderbox/MakeCache.pm
@@ -29,7 +29,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
          }, $name;
  
          $self;
-@@ -60,20 +61,94 @@ sub _execMake {
+@@ -60,20 +61,95 @@ sub _execMake {
          my $self = shift;
          my $port = shift;
          my @ret;
@@ -42,7 +42,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
  
 -        $tmp = '-V ' . join(' -V ', @makeTargets);
 +        foreach $target (@makeTargets) {
-+                $tmp .= "-V '\${" . $target . "}' ";		
++                $tmp .= "-V '\${" . $target . "}' ";
 +        }
          my $dir = $self->{BASEDIR} . '/' . $port;
 -        @ret = split("\n", `cd $dir && make $tmp`);
@@ -68,7 +68,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
 +        unless (-e $self->{OPTFILE}) {
 +                return "";
 +        }
-+        my @data = split("\n", 
++        my @data = split("\n",
 +           `cd $dir && bmake -V '\${PKGNAME}' -V '\${PKG_OPTIONS_VAR}'`);
 +        my $pkname = $data[0];
 +        my $optvar = $data[1];
@@ -116,19 +116,20 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
 +        if ($pnative) {
 +            @worker = split(/=/, $pnative);
 +            if (scalar (@worker) >= 2) {
-+                $result .= 'PREFER_NATIVE="' . $self->_trim($worker[1]) . '"';
++                $result .= 'PREFER_NATIVE="' . $self->_trim($worker[1]) . '" ';
 +            }
 +        }
 +        if ($develop) {
-+            $result .= 'PKG_DEVELOPER=yes';
++            $result .= 'PKG_DEVELOPER=yes ';
 +        }
++        $result .= 'SKIP_LICENSE_CHECK=yes ';
 +        return $result;
 +}
 +
  # Internal function for returning a port variable
  sub _getVariable {
          my $self = shift;
-@@ -90,16 +165,28 @@ sub _getList {
+@@ -90,16 +166,28 @@ sub _getList {
          my $port = shift;
          my $item = shift;
          my @deps;
@@ -159,7 +160,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
                  }
          }
          return @deps;
-@@ -109,7 +196,7 @@ sub _getList {
+@@ -109,7 +197,7 @@ sub _getList {
  sub Name {
          my $self = shift;
          my $port = shift;
@@ -168,7 +169,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
  }
  
  # Package name
-@@ -133,6 +220,13 @@ sub Maintainer {
+@@ -133,6 +221,13 @@ sub Maintainer {
          return $self->_getVariable($port, 'MAINTAINER');
  }
  
@@ -182,7 +183,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
  # Extract dependencies
  sub ExtractDepends {
          my $self = shift;
-@@ -189,8 +283,8 @@ sub IgnoreList {
+@@ -189,8 +284,8 @@ sub IgnoreList {
  
          my $n = 0;
          $self->_execMake($port);
@@ -193,7 +194,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
          }
          return $n eq 0 ? "" : $self->PkgName($port);
  }
-@@ -206,6 +300,17 @@ sub FetchDependsList {
+@@ -206,6 +301,17 @@ sub FetchDependsList {
          return grep { !$uniq{$_}++ } @deps;
  }
  
@@ -211,7 +212,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
  sub ExtractDependsList {
          my $self = shift;
          my $port = shift;
-@@ -250,6 +355,7 @@ sub BuildDependsList {
+@@ -250,6 +356,7 @@ sub BuildDependsList {
          push(@deps, $self->FetchDepends($port));
          push(@deps, $self->BuildDepends($port));
          push(@deps, $self->LibDepends($port));
@@ -219,7 +220,7 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00:20 marino Exp $
  
          my %uniq;
          return grep { !$uniq{$_}++ } @deps;
-@@ -263,6 +369,7 @@ sub RunDependsList {
+@@ -263,6 +370,7 @@ sub RunDependsList {
          my @deps;
          push(@deps, $self->LibDepends($port));
          push(@deps, $self->RunDepends($port));