head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.4.0.14
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2013Q1:1.4.0.12
	pkgsrc-2013Q1-base:1.4
	pkgsrc-2012Q4:1.4.0.10
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.4.0.8
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.6
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.4
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.2
	pkgsrc-2011Q4-base:1.4;
locks; strict;
comment	@# @;


1.5
date	2013.08.15.11.12.06;	author marino;	state dead;
branches;
next	1.4;
commitid	H8gHqh7qKxKFBx1x;

1.4
date	2011.11.23.00.54.34;	author marino;	state Exp;
branches;
next	1.3;

1.3
date	2011.11.20.16.20.24;	author marino;	state Exp;
branches;
next	1.2;

1.2
date	2011.11.14.02.00.20;	author marino;	state Exp;
branches;
next	1.1;

1.1
date	2011.11.02.21.13.23;	author marino;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Remove pkgtools/tinderbox-dragonfly

This package is no longer in use, and is far behind upstream now.
It is heavily customized so maintenance is far from trivial.  There were
no objections to the announcement of my intentions to remove this package
which I made on package-users@@ a month ago.

I feel it is better to retire this package than allow it to bitrot further.
@
text
@$NetBSD: patch-ai,v 1.4 2011/11/23 00:54:34 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()
     cleandirs=$4
     pkgname=$5
     build=$6
-    nullfs=$7
 
-    umount ${chroot}/compat/linux/proc >/dev/null
+    if [ ${ARCH} = "i386" ]; then
+	umount ${chroot}/compat/linux/proc >/dev/null
+    fi
     umount ${chroot}/proc >/dev/null
 
     if [ $noclean -eq 0 ]; then
@@@@ -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,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
 
     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 +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 +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,20 +167,21 @@@@ 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
+	# exit with success, we need all the ports to fire on the above hook
+        exit 0
     fi
 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 +191,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
 
-# mount linprocfs if required
-if [ "${ARCH}" = "i386" -o "${ARCH}" = "amd64" ]; then
+# pkgsrc is "helpful" that it removes directories that result empty after
+# as the plist removes files of a package.  This includes standard mtree
+# directories such as man/man1, so we need to touch a file in every directory
+# of pkgsrc to prevent this side-effect which often fails the fs state check.
+
+find ${chroot}${LOCALBASE}/ -type d -exec touch {}/.keep \;
+
+# copy over pkgsrc bootstrap tools, ${LOCALBASE}/bin & /etc exist now
+cp    ${chroot}/usr/4bootstrap/bmake   ${chroot}${LOCALBASE}/bin/
+cp    ${chroot}/usr/4bootstrap/pkg_*   ${chroot}${LOCALBASE}/sbin/
+cp    ${chroot}/usr/4bootstrap/mk.conf ${chroot}${LOCALBASE}/etc/
+cp -R ${chroot}/usr/4bootstrap/mk      ${chroot}${LOCALBASE}/share/
+
+# By default, Tinderbox/pkgsrc will build all vulnerable software and
+# accept all licenses. The next file will add these directives to the mk.conf.
+# If this is unwanted on a per-build bases, use the more_make.conf file
+# to override it.
+
+cat ${pb}/scripts/lib/boilerplate_mk.conf >> ${chroot}${LOCALBASE}/etc/mk.conf
+
+# Add per-build custom make options to etc/mk.conf
+# Intended to default versions e.g. PYTHON_VERSION_DEFAULT
+# During catenation, comments, blank lines, MAKE_JOBS= and PKG_OPTIONS.xxxx
+# variables are stripped out. The latter is handled by pkg_options, and it's
+# 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 +283,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 +298,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 +312,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 +324,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,13 +332,11 @@@@ 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
 
+MISSINGDEP=
 cd ${chroot}/tmp/depends
 while [ $# -gt 0 ]; do
 
@@@@ -324,6 +352,7 @@@@ while [ $# -gt 0 ]; do
 
     if [ ! -f $1 ]; then
 	echo "skipping package $1 for ${pkgname} since it is missing"
+	MISSINGDEP=$1
     fi
 
     shift
@@@@ -337,13 +366,17 @@@@ 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
+if [ -z "${MISSINGDEP}" ]; then
+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
     error=255
 fi
 execute_hook "postPortChecksum" "PACKAGE_NAME=${pkgname} BUILD=${build} JAIL=${jail} PORTSTREE=${portstree} CHROOT=${chroot} PORTDIR=${portdir} ERROR=${error} PB=${pb} TOTAL_SIZE=${total_size}"
+else
+    error=200
+fi
 
 last_version=$(${tc} getPortLastBuiltVersion -d ${portdir} -b ${build})
 logsDir=$(tinderLoc buildlogs ${build})
@@@@ -351,14 +384,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 +398,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 +415,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 +428,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"
@@@@ -469,12 +497,19 @@@@ else
     if [ ${old_size} -gt ${total_size} ]; then
 	total_size=${old_size}
     fi
+
+    PORTSTATUS=FAIL
+    if [ "${error}" = "200" ]; then
+       PORTSTATUS=DEPEND
+       reason="-r depend_package -p ${MISSINGDEP}"
+       reasonenv="FAIL_REASON=depend"
+    fi
     ${tc} updatePortStatus -d ${portdir} -b ${build} \
-		-L -s FAIL -v ${pkgname} ${reason} -t ${total_size}
+		-L -s ${PORTSTATUS} -v ${pkgname} ${reason} -t ${total_size}
     mark_failed ${tc} ${build} ${pkgname} ${portdir}
     ${tc} sendBuildErrorMail -d ${portdir} -b ${build} -p ${pkgname} -x ${lext}
     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.4
log
@pkgtools/tinderbox-dragonFly: bulk build, jail fixes

1) postbuild hook sed was too greedy and deleted extra packages from
   the queue, fixed regex.
2) Hook checks if a queue entry exists before requesting that it be
   removed to avoid build aborts
3) The makeJail process was updated to include "make upgrade" which
   is required for certain device headers to appear.
4) Changed "dud" handling.  Previously requesting a build with a dud
   dependency would cause it never to move to the next package.
5) Add the two files that should have been committed with 3.4.1
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@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
@
text
@d88 1
a88 1
@@@@ -167,7 +167,7 @@@@ if [ -f ${dudsfile} ]; then
d96 4
a99 2
         exit 1
@@@@ -175,12 +175,12 @@@@ if [ -f ${dudsfile} ]; then
d113 1
a113 1
@@@@ -190,17 +190,48 @@@@ mtree -deU -f ${chroot}/etc/mtree/BSD.va
d167 1
a167 1
@@@@ -251,8 +282,10 @@@@ if [ x"${CCACHE_ENABLED}" = x"1" ]; then
d180 1
a180 1
@@@@ -264,11 +297,7 @@@@ packages=$(tinderLoc packages ${build})
d193 1
a193 1
@@@@ -282,7 +311,7 @@@@ mkdir -p ${chroot}/tmp/depends ${chroot}
d202 1
a202 1
@@@@ -294,7 +323,7 @@@@ if [ x"${CCACHE_ENABLED}" ]; then
d211 1
a211 1
@@@@ -302,9 +331,6 @@@@ for i in ${_ldconfig_dirs}; do
d221 14
a234 1
@@@@ -337,7 +363,7 @@@@ if [ $? -ne 0 ]; then
d239 1
d244 10
a253 1
@@@@ -351,14 +377,7 @@@@ errorsDir=$(tinderLoc builderrors ${buil
d269 1
a269 1
@@@@ -372,6 +391,7 @@@@ if [ "${error}" = "0" ]; then
d277 1
a277 1
@@@@ -388,6 +408,7 @@@@ if [ "${error}" = "0" ]; then
d285 1
a285 1
@@@@ -400,8 +421,8 @@@@ if [ "${error}" = "0" ]; then
d296 16
a311 1
@@@@ -476,5 +497,5 @@@@ else
@


1.2
log
@pkgtools/tinderbox-dragonfly: Several bug fixes

This update of tinderbox addresses several issues:
 1) Updates obsolete failure message on options.mk
 2) Adds support for PKG_DEVELOPER=yes
 3) Switches build failure default to build only once, twice is the option.
 4) Merge BOOTSTRAP_DEPENDS with FETCH_DEPENDS in order to maintain the
    same database structure as Tinderbox.  Removes two patches.
 5) Change behavior where leftover files immediately after package deinstall
    is no longer considered an error, but still list the files that do this.
 6) Add a way out of an infinite recursion loop as seen when the package
    name changed between portbuild and buildscript (considered a safeguard).
 7) Push the package name from portbuild to buildscript to avoid issue with
    php5 packages getting renamed to php53 (for example), which was the
    cause for the infinite loop on lang/pear.
 8) Fix enterbuild by allowing it to properly detected when the port has
    entered the sleep state.
 9) Fix php/pgsql bug on row limiting, should be fixed upstream for next
    released.  Requires old patch to be reincarnated.
10) Fix PLIST, several files were missing
11) Add utility script to add all 10K packages to database (this takes
    several hours to do)
@
text
@d40 1
a40 1
@@@@ -56,7 +54,12 @@@@ mark_failed() {
d54 8
a61 1
@@@@ -71,7 +74,6 @@@@ mark_failed() {
d69 1
a69 1
@@@@ -107,9 +109,6 @@@@ while [ $# -gt 0 -a ${doneargs} -eq 0 ];
d79 1
a79 1
@@@@ -151,7 +150,7 @@@@ echo ${dirname}
d88 1
a88 1
@@@@ -167,7 +166,7 @@@@ if [ -f ${dudsfile} ]; then
d97 1
a97 1
@@@@ -175,12 +174,12 @@@@ if [ -f ${dudsfile} ]; then
d111 1
a111 1
@@@@ -190,17 +189,48 @@@@ mtree -deU -f ${chroot}/etc/mtree/BSD.va
d165 1
a165 1
@@@@ -251,8 +281,10 @@@@ if [ x"${CCACHE_ENABLED}" = x"1" ]; then
d178 1
a178 1
@@@@ -264,11 +296,7 @@@@ packages=$(tinderLoc packages ${build})
d191 1
a191 1
@@@@ -282,7 +310,7 @@@@ mkdir -p ${chroot}/tmp/depends ${chroot}
d200 1
a200 1
@@@@ -294,7 +322,7 @@@@ if [ x"${CCACHE_ENABLED}" ]; then
d209 1
a209 1
@@@@ -302,9 +330,6 @@@@ for i in ${_ldconfig_dirs}; do
d219 1
a219 1
@@@@ -337,7 +362,7 @@@@ if [ $? -ne 0 ]; then
d228 1
a228 1
@@@@ -351,14 +376,7 @@@@ errorsDir=$(tinderLoc builderrors ${buil
d244 1
a244 1
@@@@ -372,6 +390,7 @@@@ if [ "${error}" = "0" ]; then
d252 1
a252 1
@@@@ -388,6 +407,7 @@@@ if [ "${error}" = "0" ]; then
d260 1
a260 1
@@@@ -400,8 +420,8 @@@@ if [ "${error}" = "0" ]; then
d271 1
a271 1
@@@@ -476,5 +496,5 @@@@ else
@


1.1
log
@Import pkgtools/tinderbox-dragonfly

Tinderbox is a well-known package building system for FreeBSD.
This commit ports the original Tinderbox to DragonFly.  The scripts
are highly platform specific, so only one operating system can be
supported per package.  With interest, alternative versions such as
tinderbox-netbsd and tinderbox-sunos could be developed fairly easily
as they would share the pkgsrc-specific changes with this package.

The repository for the project is:
https://github.com/jrmarino/pkgsrc-tinderbox
@
text
@d10 1
a10 1
+    echo "usage: $0 <build name> <jail name> <portstree name> [-noclean] [-plistcheck] [-fetch-original] [-nolog] ED PD FD BD RD TD SD pkgname dirname"
d72 1
a72 13
@@@@ -142,8 +141,9 @@@@ FD=$3
 BD=$4
 RD=$5
 TD=$6
-pkgname=$(basename $7 ${PKGSUFFIX})
-dirname=$8
+SD=$7
+pkgname=$(basename $8 ${PKGSUFFIX})
+dirname=$9
 
 echo ${pkgname}
 echo ${dirname}
@@@@ -151,7 +151,7 @@@@ echo ${dirname}
d81 1
a81 1
@@@@ -167,7 +167,7 @@@@ if [ -f ${dudsfile} ]; then
d90 1
a90 1
@@@@ -175,12 +175,12 @@@@ if [ -f ${dudsfile} ]; then
d104 1
a104 1
@@@@ -190,17 +190,48 @@@@ mtree -deU -f ${chroot}/etc/mtree/BSD.va
d158 1
a158 1
@@@@ -251,8 +282,10 @@@@ if [ x"${CCACHE_ENABLED}" = x"1" ]; then
d171 1
a171 1
@@@@ -264,11 +297,7 @@@@ packages=$(tinderLoc packages ${build})
d184 1
a184 1
@@@@ -282,7 +311,7 @@@@ mkdir -p ${chroot}/tmp/depends ${chroot}
d193 1
a193 1
@@@@ -294,7 +323,7 @@@@ if [ x"${CCACHE_ENABLED}" ]; then
d202 1
a202 1
@@@@ -302,11 +331,8 @@@@ for i in ${_ldconfig_dirs}; do
d210 1
a210 2
-set x $ED $FD $PD $BD $RD $TD
+set x $ED $FD $PD $BD $RD $TD $SD
d212 1
a212 3
 
 cd ${chroot}/tmp/depends
@@@@ -337,7 +363,7 @@@@ if [ $? -ne 0 ]; then
d217 1
a217 1
+chroot ${chroot} /buildscript ${dirname} 1 "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "$SD" "${plistcheck}" 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log
d221 1
a221 1
@@@@ -351,14 +377,7 @@@@ errorsDir=$(tinderLoc builderrors ${buil
d233 1
a233 1
+    chroot ${chroot} /usr/bin/nice -n $nice /buildscript ${dirname} 2  "$ED" "$PD" "$FD" "$BD" "$RD" "$TD" "$SD" "${plistcheck}" > ${chroot}/tmp/${pkgname}.log2 2>&1
d237 1
a237 1
@@@@ -372,6 +391,7 @@@@ if [ "${error}" = "0" ]; then
d245 1
a245 1
@@@@ -388,6 +408,7 @@@@ if [ "${error}" = "0" ]; then
d253 1
a253 1
@@@@ -400,8 +421,8 @@@@ if [ "${error}" = "0" ]; then
d264 1
a264 1
@@@@ -476,5 +497,5 @@@@ else
@