Subject: CVS commit: pkgsrc
To: None <pkgsrc-changes@NetBSD.org>
From: Johnny C. Lam <jlam@netbsd.org>
List: pkgsrc-changes
Date: 03/20/2006 01:48:58
Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Mar 20 01:48:58 UTC 2006

Modified Files:
	pkgsrc/doc/guide/files: fixes.xml
	pkgsrc/mk: bsd.pkg.check.mk bsd.pkg.mk emacs.mk
	pkgsrc/mk/defaults: mk.conf
	pkgsrc/mk/install: bsd.pkginstall.mk
	pkgsrc/mk/plist: plist-info.awk plist.mk print-plist.mk

Log Message:
* Creates a new variable PKGINFODIR (named similarly to PKGMANDIR)
  that is a purely user-settable variable to represent the relative
  path under ${PREFIX} where info files are stored and "dir" files
  are managed.  PKGINFODIR defaults to "info".  INFO_DIR still works,
  but will be obsoleted after the 2006Q1 branch.

* Modify GNU_CONFIGURE_INFODIR to only honor ${PKGINFODIR} if the
  package installs directly into ${PREFIX} and not some subdirectory
  under ${PREFIX}.  This fixes packages that don't really honor
  $(infodir) all that well, and also avoids PLIST problems relating
  to directory removal for those packages.

* Since the majority of Emacs Lisp packages use GNU_CONFIGURE, just
  set GNU_CONFIGURE_INFODIR directly to ${EMACS_INFOPREFIX}, which is
  the Emacs-distro-specific location for info files.  Also pass
  EMACS_INFOPREFIX through PLIST_SUBST for PLIST substitution.

* INFO_FILES should be defined if the package installs info files.
  If the info files are not listed in the PLIST, then INFO_FILES
  must list the filenames for the info files installed by the package,
  which are assumed to be located in ${PREFIX}/${PKGINFODIR}.

* The plist module can now better detect info files listed in PLISTs
  and exports a command to the pkginstall module to append info file
  names to the +INFO_FILES scriptlet at install-time.

* The print-PLIST target is updated to properly list info files in
  the auto-generated PLIST.

* The check-files code is updated to skip all "dir" Info database files.


To generate a diff of this commit:
cvs rdiff -r1.47 -r1.48 pkgsrc/doc/guide/files/fixes.xml
cvs rdiff -r1.29 -r1.30 pkgsrc/mk/bsd.pkg.check.mk
cvs rdiff -r1.1811 -r1.1812 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/emacs.mk
cvs rdiff -r1.112 -r1.113 pkgsrc/mk/defaults/mk.conf
cvs rdiff -r1.43 -r1.44 pkgsrc/mk/install/bsd.pkginstall.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/mk/plist/plist-info.awk
cvs rdiff -r1.6 -r1.7 pkgsrc/mk/plist/plist.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/plist/print-plist.mk

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