pkgin + mk.conf

[David Holland <dholland-pkgtech%netbsd.org@localhost>]

It turns out that pkgin's makefile (inside the package) tries to read
mk.conf, grabbing whatever it happens to find (whether or not it's the
right one) and hoping something useful will happen. In addition to
being inappropriate, this breaks if you have nontrivial logic in the
mk.conf it finds because it doesn't set assorted make variables that
pkgsrc does.

Any objections to the following patch? There doesn't seem to be
anything in the makefile that needs anything from mk.conf, but I could
be missing something.


--- Makefile.in~        2013-06-16 14:00:45.000000000 +0000
+++ Makefile.in
@@ -23,14 +23,6 @@ OPSYS!=              uname
 OS_VER!=       uname -r
 OS_ARCH!=      uname -p
 
-# satisfy mk.conf
-BSD_PKG_MK=    1
-.for MK_CONF in /etc/mk.conf @prefix@/etc/mk.conf /etc/pkgsrc.conf
-.      if exists(${MK_CONF})
-.              include "${MK_CONF}"
-.      endif
-.endfor
-
 .if ${OPSYS} == "Minix"
 PKGTOOLS?=     ${PKG_TOOLS_BIN}
 CPPFLAGS+=     -D_NETBSD_SOURCE -D_MINIX


-- 
David A. Holland
dholland%netbsd.org@localhost