bin/181475: WITHOUT_PKGTOOLS=yes doesn't build pkg but make delete-old doesn't delete it

[Adam McDougall]

>Number:         181475
>Category:       bin
>Synopsis:       WITHOUT_PKGTOOLS=yes doesn't build pkg but make delete-old doesn't delete it
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 23 01:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Adam McDougall
>Release:        9.2-BETA1
>Organization:
>Environment:
FreeBSD hostname 9.2-BETA1 FreeBSD 9.2-BETA1 #0 r253631: Thu Jul 25 21:44:11 EDT 2013 root at hostname2:/usr/obj/usr/src/sys/AMD64-9  amd64
>Description:
After several mistaken runs of pkg_add while I was using pkgng, I decided it was time to purge
pkg_* from my systems.  I added WITHOUT_PKGTOOLS=yes to make.conf and 'make delete-old' in
/usr/src did what I wanted, deleted the old pkg_ tools without deleting /usr/sbin/pkg.  I added
WITHOUT_PKGTOOLS=yes to my build procedure for new systems but found out it doesn't compile or
install /usr/sbin/pkg.  This was inconvenient although I could fetch, manually extract, and run
pkg-static from a copy of pkg.tgz, but it would be nicer if /usr/sbin/pkg was still built,
possibly controlled by a different variable in make.conf for people that truly don't want it.  At
the very least, 'make delete-old' should delete /usr/sbin/pkg if buildworld isn't going to build
it, since it will get stale and possibly insecure if unmaintained.

>How-To-Repeat:
Add WITHOUT_PKGTOOLS=yes to make.conf to an existing system and run 'make delete-old' in
/usr/src, /usr/sbin/pkg remains.  But if you do a buildworld, pkg is not built or installed.

>Fix:
Preferred, remove SUBDIR+= pkg from .if ${MK_PKGTOOLS} != "no" in usr.sbin/Makefile.  Introduce a
new variable if desired.  Less preferred, but to be consistent, add /usr/sbin/pkg to
ObsoleteFiles.inc


>Release-Note:
>Audit-Trail:
>Unformatted: