 @@ -1,19 +1,19 @@
-$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"
 +export _defaultUpdateHost="cvsup.netbsd.se"
  export _defaultUpdateType="CSUP"
 +export _defaultDragonHost="http://mirror.physik-pool.tu-berlin.de/DragonFlyBSD/dflysnap"
 +export _defaultDragonType="RELEASE"
 +export _defaultGitSrcHost="koan.bondconsult.net"
  #---------------------------------------------------------------------------
  # Generic routines
  #---------------------------------------------------------------------------
 +commandTreeChecks () {
 @@ -188,178 +188,208 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
 -		    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
 +		updateCmd=/usr/pkg/bin/csup
 +		commandTreeChecks ${updateCmd} ${2} ${3}
 +		if [ "$?" -eq "1" ]; then
 +		    exit 1
  		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
+ 		    exit 1
-+		fi
+ 		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
+ 		    exit 1
-+		fi
+ 		fi
-+		( echo "#!/bin/sh"
+-		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"
 +		  echo "  mkdir ../tmp ../obj"
 +		  echo "  ${updateCmd} init"
 +		  echo "  ${updateCmd} remote add origin git://${4}/dragonfly.git"
 +		  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}"
 +		  echo "fi"
 +		  echo "echo 'Ready to pull updates from branch.'"
 +		  echo "${updateCmd} checkout ${5}"
 +		  echo "${updateCmd} pull"
-+		) > ${treeDir}/update.sh
+ 		) > ${treeDir}/update.sh
-+		chmod +x ${treeDir}/update.sh
+ 		chmod +x ${treeDir}/update.sh
-+		;;
+ 		;;
@@ -223,6 +246,15 @@ setupDefaults () {
      *)		echo "ERROR: ${1} ${2}: unknown update type: ${3}"
  		exit 1;;
@@ -177,6 +246,15 @@ setupDefaults () {
      if [ -z "${defaultUpdateType}" ]; then
          export defaultUpdateType=${_defaultUpdateType}
      fi
 +    if [ -z "${defaultDragonHost}" ]; then
 +        export defaultDragonHost=${_defaultDragonHost}
 +    fi
 +    if [ -z "${defaultDragonfType}" ]; then
 +        export defaultDragonType=${_defaultDragonType}
 +    fi
 +    if [ -z "${defaultGitSrcHost}" ]; then
 +        export defaultGitSrcHost=${_defaultGitSrcHost}
 +    fi
+ }
  tcExists () {
-@@ -211,16 +289,21 @@ updateTree () {
+@@ -257,16 +289,21 @@ updateTree () {
      echo "${name}: updating ${what} with ${updateCmd}"
 +    logpipe=/tmp/tbox_logpipe
 +    mkfifo ${logpipe}
 +    tee ${dir}/update.log < ${logpipe} &
      if [ "${updateCmd}" = "USER" ]; then
 -        eval ${dir}/update.sh ${name} > ${dir}/update.log 2>&1
 +        ${dir}/update.sh ${name} > ${logpipe}
      else
 -	eval ${dir}/update.sh > ${dir}/update.log 2>&1
 +	${dir}/update.sh > ${logpipe}
      fi
      if [ $? -ne 0 ]; then
 +        rm ${logpipe}
  	echo "updateTree: ${what} ${name}: update failed"
  	echo "    see ${dir}/update.log for more details"
  	return 1
      fi
 +    rm ${logpipe}
+ }
  #---------------------------------------------------------------------------
-@@ -228,8 +311,8 @@ updateTree () {
+@@ -274,8 +311,8 @@ updateTree () {
  #---------------------------------------------------------------------------
  Setup () {
 -    MAN_PREREQS="lang/perl5.[81]*"
 -    OPT_PREREQS="lang/php[45] databases/pear-MDB2 www/php[45]-session archivers/p5-Compress-Bzip2"
 +    MAN_PREREQS="perl"
 +    OPT_PREREQS="php php*-pear-MDB2 p5-Compress-Bzip2"
      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)
 -	if [ x"${ucmd}" != x"CVSUP" -a x"${ucmd}" != x"CSUP" -a x"${ucmd}" != x"NONE" ]; then
 +	if [ x"${ucmd}" != x"CSUP" -a x"${ucmd}" != x"NONE" ]; then
  	    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
 -	elif [ x"${ucmd}" = x"CVSUP" -o x"${ucmd}" = x"CSUP" ]; then
 -	    updateCmd="/usr/bin/csup"
 -	    if [ x"${ucmd}" = x"CVSUP" ]; then
 -		updateCmd="/usr/local/bin/cvsup"
 -	    fi
 +	elif [ x"${ucmd}" = x"CSUP" ]; then
 +	    updateCmd="/usr/pkg/bin/csup"
  	    ( 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)
 -	if [ x"${ucmd}" != x"CVSUP" -a x"${ucmd}" != x"CSUP" -a x"${ucmd}" != x"NONE" ]; then
 +	if [ x"${ucmd}" != x"CSUP" -a x"${ucmd}" != x"NONE" ]; then
  	    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
 -	elif [ x"${ucmd}" = x"CVSUP" -o x"${ucmd}" = "CSUP" ]; then
 -	    updateCmd="/usr/bin/csup"
 -	    if [ x"${ucmd}" = x"CVSUP" ]; then
 -		updateCmd="/usr/local/bin/cvsup"
 -	    fi
 +	elif [ x"${ucmd}" = "CSUP" ]; then
 +	    updateCmd="/usr/pkg/bin/csup"
  	    ( echo "#!/bin/sh"
  	      echo "${updateCmd} ${f}/supfile"
  	    ) > ${f}/update.sh
  	    chmod +x ${f}/update.sh
 -	    if [ -f "${f}/ports-supfile" ]; then
 -		mv -f "${f}/ports-supfile" "${f}/supfile"
 +	    if [ -f "${f}/pkgsrc-supfile" ]; then
 +		mv -f "${f}/pkgsrc-supfile" "${f}/supfile"
  	    fi
  	fi
      done
-@@ -741,38 +818,55 @@ buildJail () {
+@@ -787,38 +818,55 @@ buildJail () {
  	return 1
      fi
 -    if [ "${updateCmd}" = "LFTP" ]; then
 -	export DESTDIR=${J_TMPDIR}
 -	cd ${jailBase}/sets/base && yes | sh ./install.sh > ${jailBase}/world.tmp 2>&1
 +    if [ "${updateCmd}" = "RELEASE" -o "${updateCmd}" = "SNAPSHOT" ]; then
 +	iso_image=`ls ${jailBase}/sets`
 +	/usr/bin/tar -xf ${jailBase}/sets/${iso_image} -C ${J_TMPDIR} > ${jailBase}/world.tmp 2>&1
  	rc=$?
 -	if [ ${rc} -eq 0 -a -d "${jailBase}/sets/lib32" ]; then
 -	    cd ${jailBase}/sets/lib32 && yes | sh ./install.sh >> ${jailBase}/world.tmp 2>&1
 -	    rc=$?
 @@ -412,38 +442,39 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
          if [ -n "${NO_JAIL_JOBS}" ]; then
  	    factor=1
          fi
 -        cd ${SRCBASE} && env DESTDIR=${J_TMPDIR} ${crossEnv} \
 -	    make -j${factor} -DNO_CLEAN world > ${jailBase}/world.tmp 2>&1
 +        cd ${SRCBASE} && env DESTDIR=${J_TMPDIR} \
 +           make -DNO_GCC41 -DNO_GAMES -DNOPROFILE -j${factor} world \
 +           > ${jailBase}/world.tmp 2>&1
          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}
 +	    return 1
  	fi
++
 +        # Bootstrap pkgsrc tools using host machine's pkgsrc for source files
 +        echo "${jailName}: bootstrapping pkgsrc basic tools"
++
 +        CYCLE="devel/bmake \
 +               sysutils/install-sh \
 +               pkgtools/bootstrap-mk-files \
 +               pkgtools/libnbcompat \
 @@ -500,179 +531,200 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
 +        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 [ $? -ne 0 ]; then
 +            echo "buildJail: Terminating Jail build since hook postJailBuild failed."
 +            buildJailCleanup 1 ${jailName} ${J_SRCDIR}
 +            return 1
 +        fi
      fi
      # Various hacks to keep the ports building environment happy
 -    touch -f ${J_TMPDIR}/etc/fstab
      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
 -    date '+%Y%m%d' > ${J_TMPDIR}/var/db/port.mkversion
      mkdir -p ${J_TMPDIR}/var/run
 -    rm -f ${J_TMPDIR}/usr/lib/aout/lib*_p.a
+-
      # 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
 -    for logfile in world distribution
 +    for logfile in world distribution pkgsrc
      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}
 -    updateType=${defaultUpdateType}
 +    updateHostISO=${defaultDragonHost}
 +    updateHostSRC=${defaultGitSrcHost}
 +    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
 -	a)	jailArch="${OPTARG}";;
  	d)	descr="${OPTARG}";;
  	j)	jailName="${OPTARG}";;
  	m)	mountSrc="${OPTARG}";;
  	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
 -	echo "createJail: jail name must begin with a FreeBSD major version"
 +	echo "createJail: jail name must begin with a DragonFly BSD major version"
  	return 1
      fi
-@@ -927,6 +1077,17 @@ createJail () {
+@@ -977,10 +1077,20 @@ createJail () {
  	return 1
      fi
 +    if [ "${updateType}" = "CSUP" ]; then
 +    	echo "createJail: CSUP type cannot be used for DragonFly sources"
 +	return 1
 +    fi
++
 +    updateHost=${updateHostISO}
 +    if [ "${updateType}" = "GIT" ]; then
 +	updateHost=${updateHostSRC}
 +    fi
++
++
      echo "${jailName}: initializing tree"
      generateUpdateCode jail ${jailName} ${updateType} ${updateHost} \
- 		       ${updateTag} ${updateCompress} ${jailArch}
+-		       ${updateTag} ${updateCompress} ${jailArch} \
-@@ -1040,20 +1201,21 @@ createPortsTree () {
+-		       ${protocol} ${updateHostDirectory}
 +		       ${updateTag} ${updateCompress} ${jailArch}
      echo -n "${jailName}: adding to datastore... "
@@ -1091,28 +1201,25 @@ createPortsTree () {
      init=1
      mountSrc=""
      portsTreeName=""
 -    protocol=""
 -    updateHostDirectory=""
 +    cvsTag="."
      setupDefaults
      updateHost=${defaultUpdateHost}
      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
  	d)	descr="${OPTARG}";;
  	m)	mountSrc="${OPTARG}";;
  	p)	portsTreeName="${OPTARG}";;
 -	u)	updateType="${OPTARG}";;
 +	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
 +    if [ "${updateType}" != "CSUP" ]; then
 +    	echo "createPortsTree: The defaultUpdateType variable in env was changed to ${updateType}"
 +    	echo "Please change it back to 'CSUP', which is the only method supported to get pkgsrc"
 +    	return 1
 +    fi
++
      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/\//_/')
 -    portFullDir=${buildRoot}/usr/ports/${portDir}
 +    portFullDir=${buildRoot}/usr/pkgsrc/${portDir}
      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
 -    echo
 +    echo
      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=""
 -    nullfs=""
      cleandistfiles="0"
      # argument handling
-@@ -1278,7 +1445,6 @@ resetBuild () {
+@@ -1334,7 +1445,6 @@ resetBuild () {
  	case "${arg}" in
  	b)	build="${OPTARG}";;
 -	n)	nullfs="-n";;
  	?)	exit 1;;
  	esac
-@@ -1434,22 +1600,23 @@ tinderbuild_setup () {
+@@ -1490,22 +1600,23 @@ tinderbuild_setup () {
      echo "tinderbuild: Finalizing chroot environment"
      # Mount ports/
 -    if ! requestMount -t buildports -b ${build} -r ${nullfs}; then
 +    if ! requestMount -t buildports -b ${build} -r ; then
  	echo "tinderbuild: cannot mount ports source"
  	tinderbuild_cleanup 1
      fi
 -    ln -sf ../a/ports ${buildRoot}/usr/ports
 +    rm -rf ${buildRoot}/usr/pkgsrc
 +    ln -s ../a/pkgsrc ${buildRoot}/usr/pkgsrc
      # Mount src/
 @@ -681,112 +733,112 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
  	echo "tinderbuild: cannot mount jail source"
  	tinderbuild_cleanup 1
      fi
      # For use by pnohang
      # XXX: though killall may not work since it's a dynamic executable
 -    cp -p /rescue/mount /rescue/umount ${buildRoot}/sbin
 -    cp -p /rescue/ps ${buildRoot}/bin
 +    cp -p /sbin/mount /sbin/umount ${buildRoot}/sbin
 +    cp -p /bin/ps ${buildRoot}/bin
      # 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
 -    # Hack to fix some recent pkg_add problems in some releases
 -    pitar=$(tinderLoc jail ${jail})/pkg_install.tar
 -    if [ -f ${pitar} ]; then
 -	tar -C ${buildRoot} -xf ${pitar}
 -    fi
+-
      # 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} \
 -		-s ${ccacheDir} ${nullfs}; then
 +		-s ${ccacheDir} ; then
  	    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})
 -	if ! requestMount -t buildoptions -b ${build} \
 -	    	-s ${optionsDir} ${nullfs}; then
 +	if ! requestMount -t buildoptions -b ${build} -s ${optionsDir} ; then
  	    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
 -    onceonly=0
 +    twice=0
      onlymake=0
      noduds=""
 -    nullfs=""
      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";;
 -	x-nullfs)		pbargs="${pbargs} -nullfs"; nullfs="-n";;
  	x-plistcheck)		pbargs="${pbargs} -plistcheck";;
 -	x-onceonly)		onceonly=1;;
 +	x-twice)		twice=1;;
  	-*)			return 1;;
  	*)			ports="${ports} $1";;
-@@ -1780,7 +1938,8 @@ tinderbuild () {
+@@ -1836,7 +1938,8 @@ tinderbuild () {
  		echo "tinderbuild: cannot mount portstree: ${portstree}"
  		exit 1
  	    fi
 -	    env PORTSDIR=$(tinderLoc portstree ${portstree})/ports \
 +	    env PORTSDIR=$(tinderLoc portstree ${portstree})/pkgsrc \
 +	        OPTNFILE=$(tinderLoc options $build)/pkg_options \
  		$(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|')
 -    if [ ${osmajor} -lt 6 ]; then
 -	echo "tinderbuild: unhandled OS version: ${osmajor}"
 -	tinderbuild_cleanup 1
 -    fi
      tinderbuild_setup
-@@ -1810,7 +1965,7 @@ tinderbuild () {
+@@ -1866,7 +1965,7 @@ tinderbuild () {
      ${tc} updateBuildStatus -b ${build} -s PORTBUILD
      tinderbuild_phase 0 ${jobs} ${pkgDir}
      error=$?
 -    if [ ${onceonly} -ne 1 ]; then
 +    if [ ${twice} -eq 1 ]; then
  	if [ ${error} -ne 0 ] ; then
  	    tinderbuild_setup
  	fi
-@@ -1829,21 +1984,46 @@ init () {
+@@ -1885,21 +1984,46 @@ init () {
  	mkdir -p ${pb}/${dir}
      done
 -    read -p "Enter a default cvsup host [${_defaultUpdateHost}]: " host
 +    read -p "Enter a default cvsup server for pkgsrc [${_defaultUpdateHost}]: " host
      if [ -z "${host}" ]; then
  	host=${_defaultUpdateHost}
      fi
 -    read -p "Enter a default update type or command [${_defaultUpdateType}]: " type
 -    if [ -z "${type}" ]; then
 -	type=${_defaultUpdateType}
 +    # Update type is not optional, it's CSUP only, so we won't ask.
 @@ -819,37 +871,37 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
      globalenv=$(tinderLoc scripts etc/env)/GLOBAL
      echo "export defaultUpdateHost=${host}" >> ${globalenv}
 -    echo "export defaultUpdateType=${type}" >> ${globalenv}
 +    echo "export defaultUpdateType=${_defaultUpdateType}" >> ${globalenv}
 +    echo "export defaultDragonHost=${dragonhost}" >> ${globalenv}
 +    echo "export defaultDragonType=${_defaultDragonType}" >> ${globalenv}
 +    echo "export defaultGitSrcHost=${gitsrchost}" >> ${globalenv}
 -    tinderEcho "Default update host and type have been set.  These can be changed later by modifying ${globalenv}."
 +    tinderEcho "The defaults have been set.  These can be changed later by modifying ${globalenv}."
      return 0
+ }
-@@ -1892,7 +2072,8 @@ addPortToBuild () {
+@@ -1948,7 +2072,8 @@ addPortToBuild () {
      buildenv ${jail} ${portsTree} ${build}
      buildenvNoHost ${build}
 -    export PORTSDIR=$(tinderLoc portstree ${portsTree})/ports
 +    export PORTSDIR=$(tinderLoc portstree ${portsTree})/pkgsrc
 +    export OPTNFILE=$(tinderLoc options $build)/pkg_options
      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
 -    if [ ${options} -eq 1 -a ${OPTIONS_ENABLED} -eq 1 ]; then
 -	pdirs=""
 -	if [ -z "${portDir}" ]; then
 -	    pdirs=$(${tc} getPortsForBuild -b ${build} 2>/dev/null)
 -	else
 -	    pdirs="${PORTSDIR}/${portDir}"
 -	fi
 -	rmconfig=true
 -	if [ ${cleanOptions} -eq 1 ]; then
 -	    if [ -z "${norecurse}" ]; then
 @@ -867,51 +919,51 @@ $NetBSD: patch-aa,v 1.2 2011/11/14 02:00
 -		    ( cd ${pdir} && ${rmconfig} \
 -		      && make -k config-recursive )
 -	        else
 -		    ( cd ${pdir} && ${rmconfig} \
 -		      && make config )
 -	        fi
 -	    fi
 -	done
 -    fi
 +    # FreeBSD-style interactive option entering not supported yet
      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
 -		(
 -		  cd ${srcOptionsDir}
 -		  tar -cpf - . | tar -C ${destOptionsDir} -xpf -
 -		)
 +		cp ${srcOptionsDir}/pkg_options ${destOptionsDir}
  	    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})
 -	    path="${path}/ports/${port}/Makefile"
 +	    path="${path}/pkgsrc/${port}/Makefile"
  	    if [ -e ${path} ]; then
  	        if [ ${cleanDistfiles} = 1 ]; then
  		    oldcwd=${PWD}
  		    path=$(tinderLoc portstree ${portstree})
 -		    cd "${path}/ports/${port}"
 -		    distinfo=$(env PORTSDIR="${path}/ports" make -V MD5_FILE)
 +		    cd "${path}/pkgsrc/${port}"
 +		    distinfo=$(env PORTSDIR="${path}/pkgsrc" bmake -V MD5_FILE)
  		    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})
 -	    path="${path}/ports/${port}/Makefile"
 +	    path="${path}/pkgsrc/${port}/Makefile"
  	    if [ ! -e ${path} ]; then
  		echo "Removing build port database entry for nonexistent port ${build}/${port}"

 @@ -1,14 +1,14 @@
-$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
 @@ -5,7 +5,7 @@
  . ${pb}/scripts/lib/tinderlib.sh
  usage () {
 -    echo "usage: $0 <build name> <jail name> <portstree name> [-noclean] [-plistcheck] [-nullfs] [-fetch-original] [-nolog] ED PD FD BD RD TD pkgname dirname"
 +    echo "usage: $0 <build name> <jail name> <portstree name> [-noclean] [-plistcheck] [-fetch-original] [-nolog] ED PD FD BD RD TD pkgname dirname"
      exit 1
+ }
 @@ -17,9 +17,10 @@ cleanup()
 @@ -27,91 +27,98 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00
 @@ -31,11 +32,8 @@ cleanup()
  	    rm -rf ${chroot}/tmp/*
  	    chroot ${chroot} /sbin/ldconfig -R
 -	    if [ ${ARCH} = "i386" ]; then
 -	        chroot ${chroot} /sbin/ldconfig -aout -R
 -	    fi
  	else
 -	    ${tc} resetBuild -b ${build} ${nullfs}
 +	    ${tc} resetBuild -b ${build}
  	fi
      fi
-@@ -56,7 +54,12 @@ mark_failed() {
+@@ -56,13 +54,19 @@ mark_failed() {
  	return
      fi
 -    dependents=$(grep ${pkgname} ${mf} | grep '^[[:space:]]\{1,\}@' | awk '{print $NF}' | sed -e 's|^/usr/ports/||' | grep -v ${portdir})
 +    dependents=$(grep ${pkgname} ${mf} | \
 +    	grep '^[[:space:]]\{1,\}@' | \
 +    	awk '{print $NF}' | \
 +    	sed -e 's|^/usr/pkgsrc/||' | \
 +    	sed -e 's|^../../||' | \
 +    	grep -v ${portdir})
      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
 -nullfs=""
  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;;
 -    x-nullfs)		nullfs="-n"
 -			shift;;
+-
      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}"
 -portdir=$(echo ${dirname} | sed -e 's|^/usr/ports/||')
 +portdir=$(echo ${dirname} | sed -e 's|^/usr/pkgsrc/||')
  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} \
 -		-L -s DUD -v ${pkgname}
 +		-L -s DUD -v ${pkgname} -r arch
  	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
 +# These are created/recreated after blowing the directories away
  cleandirs="${LOCALBASE} /compat /var/db/pkg"
  for dir in ${cleandirs}; do
      cleanDirs ${build} ${chroot}${dir}
  done
 -rm -rf ${chroot}/var/db/pkg/*
  # 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
 -mkdir -p ${chroot}${LOCALBASE}
 -if [ -f ${chroot}/a/ports/Templates/BSD.local.dist ]; then
 -    mtree -deU -f ${chroot}/a/ports/Templates/BSD.local.dist -p ${chroot}${LOCALBASE} \
 +if [ -f ${chroot}/a/pkgsrc/Templates/BSD.local.dist ]; then
 +    mtree -deU -f ${chroot}/a/pkgsrc/Templates/BSD.local.dist -p ${chroot}${LOCALBASE} \
      	>/dev/null 2>&1
  else
      mtree -deU -f ${chroot}/etc/mtree/BSD.local.dist -p ${chroot}${LOCALBASE} \
      	>/dev/null 2>&1
  fi
 @@ -145,126 +152,126 @@ $NetBSD: patch-ai,v 1.2 2011/11/14 02:00
 +# better not to have two sources.
++
 +more_mkconf=$(tinderLoc options ${build})/more_mk.conf
 +if [ -f ${more_mkconf} ]; then
 +    cat ${more_mkconf} | awk "!/^[ \t]*($|#|PKG_OPTIONS\.|MAKE_JOBS=)/" \
 +    >> ${chroot}${LOCALBASE}/etc/mk.conf
 +fi
++
 +# mount linprocfs if available
 +if [ ${ARCH} = "i386" ]; then
      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
 -if [ x"${OPTIONS_ENABLED}" = x"1" ]; then
 -    export PORT_DBDIR=/var/db/ports
 +export PKG_OPTIONS_FILE=
 +original_options=$(tinderLoc options ${build})/pkg_options
 +if [ x"${OPTIONS_ENABLED}" = x"1" -a -f ${original_options} ]; then
 +    export PKG_OPTIONS_FILE=/var/db/options/pkg_options
  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
 -    export DISTCACHE=/distcache
 -    if [ ${fetchorig} -eq 0 ]; then
 -        _MSO='file:///distcache/${DIST_SUBDIR}/'
 -        export MASTER_SITE_OVERRIDE="${_MSO} ${MASTER_SITE_OVERRIDE}"
 -    fi
 +    export DISTDIR=/distcache
  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
 -trap  "cleanup ${chroot} ${noclean} ${error} \"${cleandirs}\" ${pkgname} ${build} ${nullfs}" 1 2 3 9 10 11 15
 +trap  "cleanup ${chroot} ${noclean} ${error} \"${cleandirs}\" ${pkgname} ${build}" 1 2 3 9 10 11 15
  # 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
 -_ldconfig_dirs="/lib /usr/lib /usr/lib/compat"
 +_ldconfig_dirs="/usr/lib"
  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}
 -if [ ${ARCH} = "i386" ]; then
 -    chroot ${chroot} /sbin/ldconfig -aout /usr/lib/aout /usr/lib/compat/aout
 -fi
  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
 -chroot ${chroot} /buildscript ${dirname} 1 "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "${plistcheck}" 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log
 +chroot ${chroot} /buildscript ${dirname} 1 "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "${pkgname}" "${plistcheck}" 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log
  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
 -    # Cache the distfiles if requested.  We will wait a maximum of
 -    # ten minutes before giving up on the lock.
 -    if [ -n "${DISTFILE_CACHE}" ]; then
 -	lockf -t 600 ${chroot}${DISTCACHE}/.lock tar -C ${chroot}/${DISTDIR} \
 -	    -cf - . | tar --unlink -C ${chroot}${DISTCACHE} -xvf -
 -    fi
+-
 -    chroot ${chroot} /usr/bin/nice -n $nice /buildscript ${dirname} 2  "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "${plistcheck}" > ${chroot}/tmp/${pkgname}.log2 2>&1
 +    chroot ${chroot} /usr/bin/nice -n $nice /buildscript ${dirname} 2  "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "${pkgname}" "${plistcheck}" > ${chroot}/tmp/${pkgname}.log2 2>&1
      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
 +        rm -f ${logdir}/${pkgname}.log${lext}
  	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
 +    rm -f ${errorsDir}/${pkgname}.log*
      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}
 -	rm -f ${errorsDir}/${pkgname}.log*
 -	if bzgrep -q "${pkgname} is marked as broken: " ${logsDir}/${pkgname}.log${lext} ; then
 +	BROKE=`zgrep -q "${pkgname} is marked as broken: " ${logsDir}/${pkgname}.log${lext}`
 +	if [ "${BROKE}" != "" ] ; then
  	    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
 -cleanup ${chroot} ${noclean} ${error} "${cleandirs}" ${pkgname} ${build} ${nullfs}
 +cleanup ${chroot} ${noclean} ${error} "${cleandirs}" ${pkgname} ${build}
  exit ${error}

 @@ -1,36 +1,36 @@
-$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
 +#!/usr/pkg/bin/perl
  #-
  # Copyright (c) 2004-2008 FreeBSD GNOME Team <freebsd-gnome@FreeBSD.org>
  # All rights reserved.
 @@ -188,15 +188,15 @@ my $ds = new Tinderbox::TinderboxDS();
                  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:',
          },
          "addPortsTree" => {
                  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:',
          },
          "addPort" => {
                  help => "Add a port to the datastore",
 @@ -240,9 +240,16 @@ my $ds = new Tinderbox::TinderboxDS();
                  func => \&getDependenciesForPort,
                  help => "Get stored dependencies for a given port and build",
                  usage =>
 -                    "-b <build name> -d <port directory> [-t EXTRACT_DEPENDS|PATCH_DEPENDS|FETCH_DEPENDS|BUILD_DEPENDS|LIB_DEPENDS|RUN_DEPENDS|TEST_DEPENDS]",
 +                    "-b <build name> -d <port directory> [-t EXTRACT_DEPENDS|PATCH_DEPENDS|FETCH_DEPENDS|BUILD_DEPENDS|LIB_DEPENDS|RUN_DEPENDS|TEST_DEPENDS|DEPENDS]",
                  optstr => 'b:d:t:',
 @@ -39,37 +39,37 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00
 +                func => \&getDependencyCascades,
 +                help => "Get unique dependencies of port's dependencies, recursively",
 +                usage =>
 +                    "-b <build name> -d <port directory>",
 +                optstr => 'b:d:',
 +        },
          "listHooks" => {
                  func => \&listHooks,
                  help =>
 @@ -560,15 +567,15 @@ my $ds = new Tinderbox::TinderboxDS();
          "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>]",
+-                    "-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:CH:m:u:Ia:',
+-                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:',
          },
          "createPortsTree" => {
                  help => "Create a new portstree",
                  usage =>
--                    "-p <portstreename> -u CSUP|CVSUP|USER|NONE [-d <description>] [-C] [-H <updatehost>] [-m <mountsrc>] [-w <cvsweburl>] [-I]",
+-                    "-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:CH:Im:u:w:',
+-                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:',
          },
          "createBuild" => {
 @@ -592,21 +599,21 @@ my $ds = new Tinderbox::TinderboxDS();
          "resetBuild" => {
                  help   => "Cleanup and reset a Build environment",
 -                usage  => "-b <buildname> [-n]",
 -                optstr => 'b:n',
 +                usage  => "-b <buildname>",
 +                optstr => 'b:',
 @@ -81,69 +81,115 @@ $NetBSD: patch-as,v 1.2 2011/11/14 02:00
 -                    "-b <build name> [-init] [-cleanpackages] [-updateports] [-skipmake] [-noclean] [-noduds] [-plistcheck] [-nullfs] [-cleandistfiles] [-fetch-original] [-onceonly] [portdir/portname [...]]",
 +                    "-b <build name> [-init] [-cleanpackages] [-updateports] [-skipmake] [-noclean] [-noduds] [-plistcheck] [-cleandistfiles] [-fetch-original] [-onceonly] [portdir/portname [...]]",
                  optstr => 'b:',
          },
          "updatePortsTree" => {
                  help   => "Update an existing ports tree",
                  usage  => "-p <portstreename>",
 -                optstr => 'p',
 +                optstr => 'p:',
          },
          "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 {
+                 foreach my $port ($ds->getPortsForBuild($build)) {
-                                 LIB_DEPENDS     => 'LibDepends',
+@@ -1502,7 +1519,25 @@ sub addPortToOneBuild {
                                  RUN_DEPENDS     => 'RunDepends',
-                                 TEST_DEPENDS    => 'TestDepends',
+         if ($opts->{'R'}) {
-+                                DEPENDS         => 'Buildlink3Depends',
+                 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 {
+                                 }
+                         }
+                 }
+-
+         }
+ }
-@@ -1600,7 +1607,7 @@ sub addBuildPortsQueueEntry {
+@@ -1600,7 +1625,7 @@ sub addBuildPortsQueueEntry {
                      $ds->addBuildPortsQueueEntry($build, $portdir, $priority,
                          $user_id);
                  if (!$rc) {
 -                        warn(         "Failed to add port "
 +                        warn(         "Failed to add port "
                                      . $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,
 +                DEPENDS         => 7,
          );
          if (!$opts->{'b'} || !$opts->{'d'}) {
-@@ -1773,6 +1781,50 @@ sub getDependenciesForPort {
+@@ -1773,6 +1799,50 @@ sub getDependenciesForPort {
                  );
+         }
+ }
++
 +sub getDependencyCascades {
 +        if (!$opts->{'b'} || !$opts->{'d'}) {
 +                usage("getDependencyCascades");
 +        }
++
 +        my $port = $ds->getPortByDirectory($opts->{'d'});
 +        if (!defined($port)) {
 +                cleanup($ds, 1,
 +                              "Port, "

 @@ -1,14 +1,14 @@
-$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
 @@ -31,14 +31,14 @@ use strict;
  # a list of variables that we pull from the port Makefile
  our @makeTargets = (
 -        'PKGNAME',         'IGNORE',
 -        'NO_PACKAGE',      'FORBIDDEN',
 +        'PKGNAME',         '_CBBH',
          'EXTRACT_DEPENDS', 'PATCH_DEPENDS',
          'FETCH_DEPENDS',   'BUILD_DEPENDS',
          'LIB_DEPENDS',     'RUN_DEPENDS',
 @@ -19,66 +19,66 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00
 +        'DISTFILES',       'BOOTSTRAP_DEPENDS',
 +        'DEPENDS'
  );
  # Create a new cache object
 @@ -48,6 +48,7 @@ sub new {
                  CACHE   => undef,
                  SEEN    => undef,
                  BASEDIR => shift,
 +                OPTFILE => shift,
          }, $name;
          $self;
-@@ -60,20 +61,94 @@ sub _execMake {
+@@ -60,20 +61,95 @@ sub _execMake {
          my $self = shift;
          my $port = shift;
          my @ret;
 -        my $tmp;
 +        my $target;
 +        my $deptype;
 +        my $tmp = '';
          return if ($self->{SEEN}->{$port} eq 1);
 -        $tmp = '-V ' . join(' -V ', @makeTargets);
 +        foreach $target (@makeTargets) {
 +                $tmp .= "-V '\${" . $target . "}' ";
 +        }
          my $dir = $self->{BASEDIR} . '/' . $port;
 -        @ret = split("\n", `cd $dir && make $tmp`);
 +        my $customOptions = $self->_package_options ($dir);
 +        my $nativeOptions = $self->_native_preferences ();
 +        @ret = split("\n", `cd $dir && bmake $customOptions $nativeOptions $tmp`);
          foreach $tmp (@makeTargets) {
 -                $self->{CACHE}->{$port}{$tmp} = shift @ret;
 +                $deptype = $tmp;
 +                if (${tmp} eq "BOOTSTRAP_DEPENDS") {
 +                        $deptype = "FETCH_DEPENDS";
 +                }
 +                $self->{CACHE}->{$port}{$deptype} = shift @ret;
+         }
          $self->{SEEN}->{$port} = 1;
+ }
 +# Get option variable name and requested options
 +sub _package_options {
 +        my $self = shift;
 +        my $dir  = shift;
 +        unless (-e $self->{OPTFILE}) {
 +                return "";
 +        }
 +        my @data = split("\n",
 +           `cd $dir && bmake -V '\${PKGNAME}' -V '\${PKG_OPTIONS_VAR}'`);
 +        my $pkname = $data[0];
 +        my $optvar = $data[1];
 +        $pkname =~ s/nb[0-9]+$//;
 +        my $instruction = `grep ^$pkname: $self->{OPTFILE}`;
 +        unless ($instruction) {
 +                return "";
 +        }
 +        my @customSet = split(/:/, $instruction);
 +        unless (scalar (@customSet) >= 3) {
 +                return "";
 +        }
 +        return $optvar . '="' . $customSet[2] . '"';
 @@ -106,39 +106,40 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00
 +        my $result = "";
 +        my $ppkgsrc=`grep PREFER_PKGSRC $moremk`;
 +        my $pnative=`grep PREFER_NATIVE $moremk`;
 +        my $develop=`grep PKG_DEVELOPER $moremk`;
 +        if ($ppkgsrc) {
 +            @worker = split(/=/, $ppkgsrc);
 +            if (scalar (@worker) >= 2) {
 +                    $result = 'PREFER_PKGSRC="' . $self->_trim($worker[1]) . '" ';
 +            }
 +        }
 +        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;
 +        my $found;
          $self->_execMake($port);
          foreach my $dep (split(/\s+/, $self->{CACHE}->{$port}{$item})) {
 +                $dep =~ s/^\s+//;
 +                $dep =~ s/\s+$//;
                  my ($d, $ddir) = split(/:/, $dep);
 -                if (!defined($ddir) || $item eq 'DEPENDS') {
 +                if (!defined($ddir)) {
                          $ddir = $d;
 @@ -149,81 +150,81 @@ $NetBSD: patch-aw,v 1.2 2011/11/14 02:00
 -                        push @deps, $ddir;
 +                        $found = 0;
 +                        foreach my $storedep (@deps) {
 +                                if ($storedep eq $ddir) {
 +                                        $found = 1;
 +                                }
 +                        }
 +                        if (!$found) {
 +                                push @deps, $ddir;
 +                        }
+                 }
+         }
          return @deps;
-@@ -109,7 +196,7 @@ sub _getList {
+@@ -109,7 +197,7 @@ sub _getList {
  sub Name {
          my $self = shift;
          my $port = shift;
 -        return $self->_getVariable($port, 'PORTNAME');
 +        return $self->_getVariable($port, 'PKGBASE');
+ }
  # Package name
-@@ -133,6 +220,13 @@ sub Maintainer {
+@@ -133,6 +221,13 @@ sub Maintainer {
          return $self->_getVariable($port, 'MAINTAINER');
+ }
 +# Buildlink3 dependencies
 +sub Buildlink3Depends {
 +        my $self = shift;
 +        my $port = shift;
 +        return $self->_getList($port, 'DEPENDS');
 +}
++
  # 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);
 -        foreach my $var ('NO_PACKAGE', 'IGNORE', 'FORBIDDEN') {
 -                $n++ if ($self->{CACHE}->{$port}{$var} ne "");
 +        foreach my $var ('_CBBH') {
 +                $n++ if ($self->{CACHE}->{$port}{$var} ne "yes");
+         }
          return $n eq 0 ? "" : $self->PkgName($port);
+ }
-@@ -206,6 +300,17 @@ sub FetchDependsList {
+@@ -206,6 +301,17 @@ sub FetchDependsList {
          return grep { !$uniq{$_}++ } @deps;
+ }
 +sub Buildlink3DependsList {
 +        my $self = shift;
 +        my $port = shift;
++
 +        my @deps;
 +        push(@deps, $self->Buildlink3Depends($port));
++
 +        my %uniq;
 +        return grep { !$uniq{$_}++ } @deps;
 +}
++
  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));
 +        push(@deps, $self->Buildlink3Depends($port));
          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));
 +        push(@deps, $self->Buildlink3Depends($port));
          my %uniq;
          return grep { !$uniq{$_}++ } @deps;

 @@ -1,34 +1,36 @@
-@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
 man/man1/tc-configJail.1
 man/man1/tc-configTinderd.1
 man/man1/tc-init.1
 share/examples/rc.d/tinderd
 tinderbox/scripts/.version
 tinderbox/scripts/README
 tinderbox/scripts/ds.ph.dist
 tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt
 tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh
 tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf
 tinderbox/scripts/contrib/hooks/kse-fix/README.txt
 tinderbox/scripts/contrib/hooks/kse-fix/kse-fix.sh
 tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt
 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
 tinderbox/scripts/lib/Tinderbox/Config.pm
 tinderbox/scripts/lib/Tinderbox/Hook.pm
 tinderbox/scripts/lib/Tinderbox/Jail.pm
 tinderbox/scripts/lib/Tinderbox/MakeCache.pm
 tinderbox/scripts/lib/Tinderbox/Port.pm
 tinderbox/scripts/lib/Tinderbox/PortFailPattern.pm
 tinderbox/scripts/lib/Tinderbox/PortFailReason.pm
 tinderbox/scripts/lib/Tinderbox/PortsTree.pm
 tinderbox/scripts/lib/Tinderbox/TinderObject.pm
 tinderbox/scripts/lib/Tinderbox/TinderboxDS.pm
 @@ -63,34 +65,36 @@ tinderbox/scripts/upgrade/build_ports.ma
 tinderbox/scripts/upgrade/build_ports_queue.map
 tinderbox/scripts/upgrade/builds.map
 tinderbox/scripts/upgrade/config.map
 tinderbox/scripts/upgrade/hooks.map
 tinderbox/scripts/upgrade/jails.map
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.0_to_3.1.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.1_to_3.2.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.1_to_3.2.2.sql
 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
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.1_to_3.2.2.sql
 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
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/BuildGroups.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/BuildPortsQueue.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/Config.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/Hooks.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/Jail.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/LogfilePattern.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/Port.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/PortFailPattern.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/PortFailReason.php
 ${PLIST.WEBUI}tinderbox/scripts/webui/core/PortsTree.php

 @@ -1,32 +1,30 @@
-$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
+SHA1 (tinderbox-3.4.1.tar.gz) = bfa81429749cb3045887d54a7d83d76632404870
-RMD160 (tinderbox-3.4.tar.gz) = 4783292e3d89f9ded643d57c1f0055b5fc53e3a9
+RMD160 (tinderbox-3.4.1.tar.gz) = 00b74f300c202e45d224b1c6c1bde1d8c21f3e44
-Size (tinderbox-3.4.tar.gz) = 147218 bytes
+Size (tinderbox-3.4.1.tar.gz) = 147755 bytes
-SHA1 (patch-aa) = 13f228c8f4b1e1df590f7e0a9687dd219d6b08a5
+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-ai) = b3ece9f6651a3ea2fc762a7818971fe69a18f6ef
 SHA1 (patch-ah) = ddfdb143e7eee5e838b8ab9affbf6992016f05f1
 SHA1 (patch-ai) = 19ec42335fbc37eed602222b20e8e21a20434baf
 SHA1 (patch-aj) = 5a6565b6844f6dbd7bb0dcd5aba74d722ae2e61b
 SHA1 (patch-ak) = af511026851a0faa893d461c4de44895d0d04410
 SHA1 (patch-al) = 0418a6aacc1ce7071a859bf69e8a29e47b64e197
 SHA1 (patch-am) = 26c9b09e99254d6d12e907876e191822ec3354f2
 SHA1 (patch-an) = f91e604e1487f99374fc3119475ab775cf8257de
 SHA1 (patch-ao) = b8635fa0fb158855a1f20d29f9251e045e2b9357
 SHA1 (patch-ap) = 6dc77ea10efb8bdf26f4fc2330f89b70cba8aaab
 SHA1 (patch-aq) = 7cc9e2f723d192038d196da94fdfd8c569559458
-SHA1 (patch-ar) = c57b04957c9ba3a140a623972d5e18e130f8dbc8
+SHA1 (patch-ar) = 7cdf8aa5c0e0b44c9a1b4e7b878d616c251e62d9
-SHA1 (patch-as) = 3cbee34e564ce7b46e17e04422770acee877e0dd
+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
 SHA1 (patch-bc) = 4d85687520e2c0d3bd6ab03c4ba9dc3f6ad6c98c
 SHA1 (patch-be) = f5e0e9a00de8d1f8b16d36f7cbe23ecc3daee47d

 @@ -1,16 +1,16 @@
-$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 @@
     Tinderbox is a package building system for FreeBSD ports, based on
     official Portbuild scripts used on pointyhat building cluster.
 -   Tinderbox was written by Joe Marcus Clarke.
 +   Tinderbox was written by Joe Marcus Clarke, and has
 +   been ported to DragonFly BSD by John Marino.
     You can define multiple jails (base system versions) and multiple
     portstrees. The combination of jail and portstree is called a
     build. A Tinderbox jail is not what is understood as a jail in
 -   FreeBSD, it is in fact a given world in a chroot. Tinderbox
 @@ -47,41 +47,41 @@ $NetBSD: patch-ar,v 1.2 2011/11/14 02:00
 -     * ports-mgmt/tinderbox-devel which tracks HEAD and might contain
 -       additional experimental patches not (yet) present in the CVS.
 +   The pkgsrc/DragonFly version of Tinderbox repository is
 +   located at https://github.com/jrmarino/pkgsrc-tinderbox
       --------------------------------------------------------------
                           Chapter 2 Requirements
 -   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/mysql41-server) or PostgreSQL 8.2 or later
--   (databases/postgres74-server).
+-   (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).
     If MySQL is used, the MySQL Perl module must also be installed
 -   (databases/p5-DBD-mysql41). If PostgreSQL is used, the Pg Perl
 -   module must also be installed (databases/p5-DBD-Pg).
 +   (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
+-     Note: Please note, however, that is is recommended that for
--   or PostgreSQL 8.1 (or later) be used. There are currently no plans
+-     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.
+-     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
 -   (databases/pear-MDB2_Driver_mysql) or PEAR::MDB2_Driver_pgsql
 -   (databases/pear-MDB2_Driver_pgsql), PHP Session
 -   (www/php5-session), and one of the PHP MySQL
 -   (databases/php5-mysql) or PHP Pgsql (databases/php5-pgsql)
 -   depending on your choice of backend database above.
 +   The web front-end (found in the webui/ subdirectory)
 +   requires PHP 5 (lang/php5),
 +   PEAR::MDB2_Driver_mysql (databases/pear-MDB2_Driver_mysql) or
 +   PEAR::MDB2_Driver_pgsql (databases/pear-MDB2_Driver_pgsql),
 +   and one of the PHP MySQL (databases/php-mysql) or
 @@ -536,30 +536,21 @@ $NetBSD: patch-ar,v 1.2 2011/11/14 02:00
 -   Tinderbox can be run in a FreeBSD jail with some concessions.
 +   Tinderbox can be run in a DragonFly jail with some concessions.
     Since neither NFS nor nullfs (at the time of writing) are usable
     in a jail, we cannot simply install and use as normal. Instead, we
     simply use a chroot.
 . Create a jail for your Tinderbox using the instructions in the
 -       FreeBSD Handbook.
 +        DragonFly Handbook.
 . 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 -
 . Now we need to leave the jail, and on the host system chroot
 @@ -938,7 +955,6 @@
   tinderd_enable="YES"
   tinderd_chroot="${jail_dir}"
   tinderd_directory="${pb}"
 - tinderd_flags="-nullfs"
 . Install a web server of your choice in the jail, and follow
         the webserver setup.

 @@ -1,63 +1,66 @@
-# $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
 MAINTAINER=	draco@marino.st
 HOMEPAGE=	http://tinderbox/marcuscom.com
 COMMENT=	Tinderbox package building system (pkgsrc)
 LICENSE=	modified-bsd
 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-*-*
 USE_TOOLS+=		perl perl:run
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 RCD_SCRIPTS=		tinderd
 WRKSRC=			${WRKDIR}/tinderbox-${TBOX_VERSION}
 TRASH=			${WRKDIR}/trash
 MAN_FILES_cmd=		${SED} -ne "s,^man/man1/,,p" PLIST
 MAN_FILES=		${MAN_FILES_cmd:sh}
 INSTALLATION_DIRS+=	tinderbox/scripts
 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
 .include "options.mk"
 post-extract:
 	${MKDIR} ${TRASH}
 .if empty(PKG_OPTIONS:Mwebui)
 	mv ${WRKSRC}/webui ${TRASH}
 .endif
 	mv ${WRKSRC}/etc/rc.d ${TRASH}
 	${MKDIR} ${WRKSRC}/contrib/bulk
-	${CP} ${FILESDIR}/add_all_packages.sh.in \
+	for dossier in add_all_packages bulk_hook_1 bulkbuild; do \
-		${WRKSRC}/contrib/bulk/add_all_packages.sh
+		${CP} ${FILESDIR}/$${dossier}.sh.in \
 		${WRKSRC}/contrib/bulk/$${dossier}.sh; \
 	done
 	chmod 755 ${WRKSRC}/contrib/bulk/*
 post-patch:
 .if !empty(PKG_OPTIONS:Manybody)
 	perl -i -pe 's/^if \[ `id -u` != 0 \]; then/if false; then/' \
 		${WRKSRC}/tc
 .endif
 	cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;
 do-install:
 	for manual in ${MAN_FILES}; do \
 		${INSTALL_MAN} ${WRKSRC}/man/man1/$${manual} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
 	done