CVS commit: src/external/bsd/pkg_install/dist

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    src
Committed By:   sevan
Date:           Sat Apr  6 00:05:47 UTC 2019

Modified Files:
        src/external/bsd/pkg_install/dist/admin: pkg_admin.1
        src/external/bsd/pkg_install/dist/info: main.c
        src/external/bsd/pkg_install/dist/lib: license.c parse-config.c pkcs7.c
            version.h

Log Message:
Fix merge conflicts from pkgsrc-20190405 import


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/main.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/parse-config.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkcs7.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/pkg_install/dist/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.