pkg/46134: The 20120221 pkg_install fails conventional build

[he%NetBSD.org@localhost]

>Number:         46134
>Category:       pkg
>Synopsis:       The 20120221 pkg_install fails conventional build
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 03 12:35:00 +0000 2012
>Originator:     Havard Eidnes
>Release:        NetBSD 5.1
>Organization:
        None
>Environment:
System: NetBSD vipe.uninett.no 5.1 NetBSD 5.1 (VIPE) #1: Mon Jan 16 10:01:42 
CET 2012 he%vipe.uninett.no@localhost:/usr/obj/sys/arch/amd64/compile/VIPE amd64
Architecture: x86_64
Machine: amd64
>Description:
        Building the 20120221 version of pkg_install fails, at least
        on NetBSD 5.1.  When doing a normal native build without any
        fancy special settings in /etc/mk.conf or in the environment
        (a setup I beleive should still be supported), by doing

        # cd /usr/pkgsrc/pkgtools/pkg_install
        # make

        The build fails when it comes to this stage:

===> Building for pkg_install-20120221
make: "/usr/pkgsrc/pkgtools/pkg_install/work/pkg_install-20120221/lib/Makefile" 
line 65: Malformed conditional (!empty(MANINSTALL:Mcatinstall))
make: Fatal errors encountered -- cannot continue

make: stopped in /usr/pkgsrc/pkgtools/pkg_install/work/pkg_install-20120221/lib
*** Error code 1

        The reason is that nothing defines MANINSTALL, and apparently the
        make in NetBSD 5.1 balks at using an undefined variable in the
        above quoted construct.

        MANINSTALL is defined in NetBSD's /usr/share/mk/* files, in particular
        in bsd.own.mk, but that file is not included in pkg_install's
        Makefile.in files, and a "ktrace -i make" and inspecting the output
        reveals that make only includes sys.mk in addition to the Makefile
        itself.

        Also, testing by setting MANINSTALL?=blah and adding an
        echo $MANINSTALL to the .c.o rule reveals that it is indeed not
        defined at that point.

>How-To-Repeat:
        Try to build pkgtools/pkg_install as described above.
        Watch it fail.

>Fix:
        To retain the traditional behaviour, I suggest that the relevant
        Makefile.in files gets MANINSTALL?=catinstall added.

        It has been verified that this does indeed fix the build.

        I have discussed this with joerg%NetBSD.org@localhost, but he seems to 
think
        that this is not an appropriate fix, although he's also not come up
        with a fix which solves the problem.

        This is therefore then submitted so that the fix can get a wider
        review.

Index: files/add/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/add/Makefile.in,v
retrieving revision 1.23
diff -u -r1.23 Makefile.in
--- files/add/Makefile.in       28 Feb 2012 18:15:25 -0000      1.23
+++ files/add/Makefile.in       3 Mar 2012 12:11:38 -0000
@@ -28,6 +28,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 PROG=          pkg_add
 
 OBJS=  main.o perform.o
Index: files/admin/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in,v
retrieving revision 1.21
diff -u -r1.21 Makefile.in
--- files/admin/Makefile.in     28 Feb 2012 18:15:25 -0000      1.21
+++ files/admin/Makefile.in     3 Mar 2012 12:11:38 -0000
@@ -24,6 +24,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 PROG=          pkg_admin
 SCRIPTS=       audit-packages download-vulnerability-list
 
Index: files/create/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/create/Makefile.in,v
retrieving revision 1.19
diff -u -r1.19 Makefile.in
--- files/create/Makefile.in    28 Feb 2012 18:15:25 -0000      1.19
+++ files/create/Makefile.in    3 Mar 2012 12:11:38 -0000
@@ -21,6 +21,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 PROG=          pkg_create
 
 .if empty(BOOTSTRAP)
Index: files/delete/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/delete/Makefile.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in
--- files/delete/Makefile.in    28 Feb 2012 18:15:26 -0000      1.16
+++ files/delete/Makefile.in    3 Mar 2012 12:11:38 -0000
@@ -21,6 +21,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 PROG=          pkg_delete
 
 OBJS=          pkg_delete.o
Index: files/info/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/info/Makefile.in,v
retrieving revision 1.22
diff -u -r1.22 Makefile.in
--- files/info/Makefile.in      28 Feb 2012 18:15:26 -0000      1.22
+++ files/info/Makefile.in      3 Mar 2012 12:11:38 -0000
@@ -32,6 +32,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 PROG=          pkg_info
 
 OBJS=  main.o perform.o show.o
Index: files/lib/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/Makefile.in,v
retrieving revision 1.30
diff -u -r1.30 Makefile.in
--- files/lib/Makefile.in       28 Feb 2012 18:15:26 -0000      1.30
+++ files/lib/Makefile.in       3 Mar 2012 12:11:38 -0000
@@ -24,6 +24,8 @@
 
 INSTALL=       @INSTALL@
 
+MANINSTALL?=   catinstall
+
 LIB=   libinstall.a
 
 OBJS=  automatic.o conflicts.o dewey.o fexec.o file.o \