[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install ensure pkg_admin is called with t...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6bc996cf0960
branches:  trunk
changeset: 462739:6bc996cf0960
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Oct 11 07:29:29 2003 +0000

description:
ensure pkg_admin is called with the full path and use the right
directory for man pages in the PLIST.

fixes remaining part of PR pkg/21858 from Jeremy C. Reed.

diffstat:

 pkgtools/pkg_install/Makefile |   7 ++++++-
 pkgtools/pkg_install/PLIST    |  32 ++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diffs (71 lines):

diff -r d5656d90b67c -r 6bc996cf0960 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Sat Oct 11 07:18:50 2003 +0000
+++ b/pkgtools/pkg_install/Makefile     Sat Oct 11 07:29:29 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2003/09/25 12:43:36 grant Exp $
+# $NetBSD: Makefile,v 1.89 2003/10/11 07:29:29 grant Exp $
 
 # Notes to package maintainers:
 #
@@ -33,6 +33,9 @@
 NO_TOOLS=              # defined
 PKG_PRESERVE=          # defined
 
+PLIST_SUBST+=          MANDIR=${MANDIR}
+PLIST_SUBST+=          PKG_TOOLS_BIN=${PKG_TOOLS_BIN}
+
 LIBNBCOMPAT_FILESDIR=  ${.CURDIR}/../../pkgtools/libnbcompat/files
 LIBNBCOMPAT_SRCDIR=    ${WRKDIR}/libnbcompat
 
@@ -69,6 +72,8 @@
 PREFIX:=               ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 .if ${PREFIX} == "/usr"
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/share/man
+MANDIR=                        share/
 .else
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/man
+MANDIR=                        # empty
 .endif
diff -r d5656d90b67c -r 6bc996cf0960 pkgtools/pkg_install/PLIST
--- a/pkgtools/pkg_install/PLIST        Sat Oct 11 07:18:50 2003 +0000
+++ b/pkgtools/pkg_install/PLIST        Sat Oct 11 07:29:29 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/01 16:27:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/10/11 07:29:29 grant Exp $
 sbin/linkfarm
 sbin/pkg_add
 sbin/pkg_admin
@@ -6,18 +6,18 @@
 sbin/pkg_delete
 sbin/pkg_info
 sbin/pkg_view
-share/man/cat1/linkfarm.0
-share/man/cat1/pkg_add.0
-share/man/cat1/pkg_admin.0
-share/man/cat1/pkg_create.0
-share/man/cat1/pkg_delete.0
-share/man/cat1/pkg_info.0
-share/man/cat1/pkg_view.0
-share/man/man1/linkfarm.1
-share/man/man1/pkg_add.1
-share/man/man1/pkg_admin.1
-share/man/man1/pkg_create.1
-share/man/man1/pkg_delete.1
-share/man/man1/pkg_info.1
-share/man/man1/pkg_view.1
-@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || pkg_admin rebuild
+${MANDIR}man/cat1/linkfarm.0
+${MANDIR}man/cat1/pkg_add.0
+${MANDIR}man/cat1/pkg_admin.0
+${MANDIR}man/cat1/pkg_create.0
+${MANDIR}man/cat1/pkg_delete.0
+${MANDIR}man/cat1/pkg_info.0
+${MANDIR}man/cat1/pkg_view.0
+${MANDIR}man/man1/linkfarm.1
+${MANDIR}man/man1/pkg_add.1
+${MANDIR}man/man1/pkg_admin.1
+${MANDIR}man/man1/pkg_create.1
+${MANDIR}man/man1/pkg_delete.1
+${MANDIR}man/man1/pkg_info.1
+${MANDIR}man/man1/pkg_view.1
+@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || ${PKG_TOOLS_BIN}/pkg_admin rebuild