Subject: pkg/21858: for pkg_install: improved DESCR, man page path, and use PKG_TOOLS_BIN
To: None <gnats-bugs@gnats.netbsd.org>
From: None <reed@reedmedia.net>
List: netbsd-bugs
Date: 06/11/2003 10:24:56
>Number:         21858
>Category:       pkg
>Synopsis:       for pkg_install: improved DESCR, man page path, and use PKG_TOOLS_BIN
>Confidential:   yes
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 11 17:26:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:
	
	
System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
The pkgtools/pkg_install/PLIST for man pages may be wrong.
Also, may needs path to pkg_admin which is ran at install time.
Also, provided below is improved COMMENT and more DESCR.
>How-To-Repeat:
	
Use LOCALBASE=/usr and then the man pages get installed in different
place from rest of installed packages.

Also, it runs pkg_admin but maybe not in path?
>Fix:
Below are some ideas for the Makefile, PLIST and DESCR:

-COMMENT=		NetBSD-current's pkg_* tools
+COMMENT=		package installation and administration tools
 
-.if ${PREFIX} == "/usr"
+.if ${OPSYS} == "NetBSD" && ${PREFIX} == "/usr"
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/man
+MANDIR=			share/
 .else
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+MANDIR=
 .endif
+PLIST_SUBST+=		MANDIR=${MANDIR}
+PLIST_SUBST+=		PKG_TOOLS_BIN=${PKG_TOOLS_BIN}


Index: pkgtools/pkg_install/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/PLIST,v
retrieving revision 1.2
diff -b -u -r1.2 PLIST
--- pkgtools/pkg_install/PLIST	2003/01/12 02:33:02	1.2
+++ pkgtools/pkg_install/PLIST	2003/06/11 17:13:16
@@ -4,14 +4,14 @@
 sbin/pkg_create
 sbin/pkg_delete
 sbin/pkg_info
-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
+${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
 @comment share/man/man1/pkg_add.1
 @comment share/man/man1/pkg_admin.1
 @comment share/man/man1/pkg_create.1
 @comment share/man/man1/pkg_delete.1
 @comment share/man/man1/pkg_info.1
-@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || pkg_admin rebuild
+@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || ${PKG_TOOLS_BIN}/pkg_admin rebuild

For DESCR:

+This package includes the package installation and administration tools:
+
+pkg_add - a utility for installing and upgrading software packages
+pkg_admin - perform various administrative tasks to the pkg system
+pkg_create - a utility for creating software package distributions
+pkg_delete - a utility for deleting previously installed software packages
+pkg_info - a utility for displaying information on software packages
+
>Release-Note:
>Audit-Trail:
>Unformatted: