handling 'bootstrap-mk-files' upgrade on pkg_rolling-replace correctly

[Siju George <sgeorge.ml%gmail.com@localhost>]

Hi,

 Currently 'pkg_rolling-replace' gives an error while upgrading
'bootstrap-mk-files'

RR> Selecting bootstrap-mk-files (pkgtools/bootstrap-mk-files) as next
package to replace
RR> Checking if bootstrap-mk-files has new depends...
RR> Replacing bootstrap-mk-files-20090807
===> Cleaning for bootstrap-mk-files-20090807nb1
===> Installing dependencies for bootstrap-mk-files-20090807nb1
===> Overriding tools for bootstrap-mk-files-20090807nb1
===> Extracting for bootstrap-mk-files-20090807nb1
===> Patching for bootstrap-mk-files-20090807nb1
===> Creating toolchain wrappers for bootstrap-mk-files-20090807nb1
===> Configuring for bootstrap-mk-files-20090807nb1
cd /usr/pkgsrc/pkgtools/bootstrap-mk-files/work/bootstrap-mk-files-20090807;
for file in bsd.* sys.mk; do                        test ! -f
mods/DragonFly.$file ||                       /bin/cp -f
mods/DragonFly.$file
/usr/pkgsrc/pkgtools/bootstrap-mk-files/work/bootstrap-mk-files-20090807/$file;
                done
cd /usr/pkgsrc/pkgtools/bootstrap-mk-files/work/bootstrap-mk-files-20090807;
   if test -f mods/DragonFly.bsd.own.mk.in; then
own_mk=mods/DragonFly.bsd.own.mk.in;                    else
                        own_mk=mods/bsd.own.mk.in;
          fi;                    /usr/bin/sed    -e
's|@ROOT_GROUP@|'wheel'|g'                    -e
's|@ROOT_USER@|'root'|g'                     -e
's|@SYSCONFDIR@|'/usr/pkg/etc'|g'
$own_mk > bsd.own.mk
===> Replacing for bootstrap-mk-files-20090807nb1
WARNING: experimental target - DATA LOSS MAY OCCUR.
Creating binary package: bootstrap-mk-files-20090807
Creating package
/usr/pkgsrc/pkgtools/bootstrap-mk-files/work/bootstrap-mk-files-20090807
=> Preserving existing +INSTALLED_INFO file.
=> Preserving existing +REQUIRED_BY file.
===> Deinstalling for bootstrap-mk-files-20090807nb1
Running /usr/pkg/sbin/pkg_delete -K /var/db/pkg  bootstrap-mk-files-20090807
pkg_delete: The following packages are marked as not for deletion:
        bootstrap-mk-files-20090807
===> Installing for bootstrap-mk-files-20090807nb1
ERROR: bootstrap-mk-files-20090807 is already installed - perhaps an
older version?
ERROR: If so, you may use either of:
ERROR:     - "pkg_delete bootstrap-mk-files-20090807" and
"/usr/pkg/bin/bmake reinstall"
ERROR:       to upgrade properly
ERROR:     - "/usr/pkg/bin/bmake update" to rebuild the package and all
ERROR:       of its dependencies
ERROR:     - "/usr/pkg/bin/bmake replace" to replace only the package without
ERROR:       re-linking dependencies, risking various problems.
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** 'make replace' failed for package bootstrap-mk-files.
*** 'make replace' failed for package bootstrap-mk-files.
*** Please read the errors listed above, fix the problem,
*** then re-run pkg_rolling-replace to continue.
- bootstrap-mk-files


And it has to be manually replaced like below

dfly-bkpsrv# cd pkgtools/bootstrap-mk-files/
dfly-bkpsrv# bmake USE_DESTDIR=yes replace
===> Installing for bootstrap-mk-files-20090807nb1
=> Creating installation directories
cd /usr/pkgsrc/pkgtools/bootstrap-mk-files/work/bootstrap-mk-files-20090807
&& for file in bsd.* sys.mk; do                      /usr/bin/install
-c -o root -g wheel -m 644 $file
/usr/pkgsrc/pkgtools/bootstrap-mk-files/work/.destdir/usr/pkg/share/mk/$file;
        done
=> Automatic manual page handling
===> Building binary package for bootstrap-mk-files-20090807nb1
=> Creating binary package
/usr/pkgsrc/packages/All/bootstrap-mk-files-20090807nb1.tgz
===> Replacing for bootstrap-mk-files-20090807nb1
WARNING: experimental target - DATA LOSS MAY OCCUR.
===> Updating using binary package of bootstrap-mk-files-20090807nb1
/usr/pkg/sbin/pkg_add -K /var/db/pkg -U
/usr/pkgsrc/packages/All/bootstrap-mk-files-20090807nb1.tgz
pkg_add: illegal option -- U
usage: pkg_add [-AfhILnRuVv] [-C config] [-P destdir] [-K pkg_dbdir]
               [-m machine] [-p prefix] [-s verification-type
               [-W viewbase] [-w view]

               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/pkgtools/bootstrap-mk-files
dfly-bkpsrv# bmake USE_DESTDIR=yes package
dfly-bkpsrv# ls
DESCR           Makefile        PLIST           files           work
dfly-bkpsrv# pkg_add -u
/usr/pkgsrc/packages/All/bootstrap-mk-files-20090807nb1.tgz


Is there any way to fix handling this correctly on pkg_rolling-replace?

Thanks

--Siju