--- ../pkginstall.sh Thu Jun 14 23:57:32 2007 +++ pkginstall.sh Tue Jun 12 16:35:26 2007 @@ -167,9 +167,14 @@ fi count=$((${count} + 1)) - echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE} - pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1 - + if [ -e /usr/ports/packages/All/${pkg}.tbz ]; then + echo "Using existing tbz package ${pkg}" >> ${LOGFILE} + cp /usr/ports/packages/All/${pkg}.tbz ${CHROOTWD}/${pkg}.tbz + bunzip2 ${CHROOTWD}/${pkg}.tbz + else + echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE} + pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1 + fi echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE} $pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1 @@ -183,7 +188,7 @@ delete_old_packages() { echo "Deleting previously installed packages" chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1 -# rm -rf ${BASEDIR}/usr/local + rm -rf ${BASEDIR}/usr/local } # Deletes workdirs