Commit graph

33 commits

Author SHA1 Message Date
minskim
c43654731a Apply PRINT_PLIST_AWK and _PLIST_PLIST_AWK_SUBST in the same order
for both files and directories.
2006-05-09 21:37:33 +00:00
jlam
1c8d9b58f1 Use brackets "[]" to quote characters instead of backslash "\". This
is more bulletproof across different versions of awk.  From PR pkg/33410
by Aleksey Cheusov.
2006-05-02 14:32:35 +00:00
rillig
4dcf0c7e97 Added the shebang line. 2006-04-24 01:31:04 +00:00
jlam
138140738b Only do the locale transformation if USE_PKGLOCALEDIR is defined. This
avoids any problems with current packages that install locale files but
don't honor PKGLOCALEDIR yet.
2006-04-17 06:30:48 +00:00
jlam
d19161d212 Modify the plist module to automatically transform "^share/locale" in
PLISTs to "${PKGLOCALEDIR}/locale" for the installed PLIST.  This is
similar to the work that's already done to automatically handle
PKGINFODIR and PKGMANDIR.  PLISTs in pkgsrc will be modified so that
they would just list the message files to be under "share/locale".
USE_PKGLOCALEDIR must continue to be set in package Makefiles so that
localedir substitutions happen at post-configure time.
2006-04-17 06:12:46 +00:00
jlam
f85023f9da Now that all info file entries have been pushed from INFO_FILES into
the PLISTs, drop support for listing info files in INFO_FILES.  The
INFO_FILES variable is now strictly defined/undefined.
2006-04-16 04:27:17 +00:00
minskim
45ddb3557a Apply jlam's awk fix done in plist-info.awk 1.12.
- Avoid () as a regular expression as the interpretation seems to be
    implementation-defined by various awks.
2006-04-15 04:25:17 +00:00
jlam
c3dcd17e53 Avoid () as a regular expression as the interpretation seems to be
implementation-defined by various awks.
2006-04-14 13:23:42 +00:00
jlam
694478afb8 If the info file doesn't exist on the disk, we should still output an
entry for it in the final PLIST.  This allows us to locate info files
in the PLIST that aren't on the system during the CHECK_FILES stage.
2006-04-12 20:49:12 +00:00
jlam
7cc69019ce Create a new variable IGNORE_LIBTOOLIZE containing files which should
not be expanded by the plist module.
2006-04-05 05:54:01 +00:00
jlam
833aaa4f40 Whitespace changes. 2006-03-30 03:03:52 +00:00
jlam
df10fbdf66 Skip symlinks without emitting warnings during PLIST creation as these
are harmless.
2006-03-30 03:02:40 +00:00
jlam
29fefe52e3 * 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.
2006-03-20 01:48:57 +00:00
jlam
56082f039b Properly rename "info" to ${INFO_DIR} in any @dirrm statements. Also
add a guard so that we don't re-expand any "info" in ${INFO_DIR} again.
2006-03-14 23:16:01 +00:00
jlam
e9045e1673 Teach the plist framework a new variable IGNORE_INFO_DIRS that is a
list of ${PREFIX}-relative paths of directories that do *not* contain
info files.  This allows avoiding the auto info-file-entry munging
that occurs for all PLIST entries that are in directories named "info".
2006-03-14 17:14:47 +00:00
jlam
e7f393b63b Sort _PLIST_AWK_ENV. 2006-03-14 16:54:28 +00:00
jlam
495bdf8ee8 Restructure pattern-actions a bit so that we're not lumping everything
into the last action.  This makes it easier to understand the flow.
2006-03-14 15:32:18 +00:00
jlam
ddf2e29cda Check that INFO_FILES is defined before using its value. Fixes PR pkg/33043. 2006-03-09 16:39:39 +00:00
jlam
b441b074cb Handle info directory trees that aren't rooted directly in ${PREFIX}, e.g.
${PREFIX}/<pkg>/info, etc.
2006-03-04 22:06:03 +00:00
jlam
15d65cd972 Info pages don't always end in ".info" as noted in PR pkg/32699. Fix the
PLIST handling based on the suggestion in the PR by Johan Danielsson.
This restores the behavior from the old PLIST code.
2006-02-07 19:18:42 +00:00
jlam
8651991fd4 Fix typo in comment. 2006-02-07 18:43:02 +00:00
jlam
4ed0831994 Provide default values for various variables if they're not present in
the shell environment array ENVIRON.
2006-02-07 18:42:38 +00:00
rillig
cd3132099e warning: escape sequence \.' treated as plain .' 2006-02-05 16:21:07 +00:00
rillig
b723cdb4c4 plist-info.awk:80: warning: escape sequence \.' treated as plain .' 2006-02-05 16:12:56 +00:00
jlam
64000a0f19 SUS says awk's delete command only deletes array elements, not the array
itself.
2006-01-22 16:54:13 +00:00
jlam
91a276733e Fix a weird newline error (probably cut-and-paste error). 2006-01-21 14:44:34 +00:00
jlam
d4a3fc56e6 Fix a typo in the comment. 2006-01-19 17:24:44 +00:00
jlam
0533f0f79e Add a catman page to the script comments to clarify how this script
should be used.  Also, do a minor reordering of lines so that the logic
is more clear.
2006-01-19 17:22:26 +00:00
seb
060fe0fd29 Signature police. 2006-01-14 00:58:37 +00:00
jlam
1591f24e5d Make use of ${.TARGET} within a target instead of re-specifying the
file again.
2006-01-13 23:09:39 +00:00
jlam
8da0cdded2 Remove the show-shlib-type target since it's no longer needed ... the
same value is returned by querying for SHLIB_TYPE via show-var, so
convert the only remaining use of show-shlib-type to just use SHLIB_TYPE.
2006-01-13 22:37:02 +00:00
jlam
cefd18eb01 Force compression and decompression to avoid the default behavior of
gzip/gunzip where hard-linked files aren't compressed/decompressed.
2006-01-13 20:03:26 +00:00
jlam
8e0e10d3fa Initial commit of a new module that encapsulates all of the code
for manipulating PLISTs.  This module is not used by default pending
more widespread testing -- currently the variable _USE_PLIST_MODULE
must be defined in /etc/mk.conf to enable its use.

The main features of the new PLIST module are:

    (1) Splits out the PLIST-handling code from bsd.pkg.mk into a
	separate "plist" module.

    (2) Splits out giant, multi-line awk scripts stored in make
	variables into separate awk scripts that may be joined
	together to post-process PLISTs.  Each of these awk scripts
	consolidates the processing for one set of files, e.g.,
	man pages, info pages, etc., and is more easily commented
	than a make variable.

    (3) Splits out the print-PLIST code from the regular PLIST code
	since they have no common pieces (print-plist.mk vs.
	plist.mk).

    (4) Completely re-implements the shared-library handling to be
	more efficient.  Along the way, this also fixes a problem
	for Mac OS X users where the PLISTs incorrectly contained
	absolute paths.

    (5) Completely re-implements the info-file handling so that we
	can migrate from INFO_FILES definitions to just adding
	info/foo.info entries in the static PLISTs.

    (6) Adds commented-out support for automatically compressed or
	decompressed info page entries based on the value of MANZ.
	These changes will be activated after texinfo.mk has been
	replaced by something that is built using the more modern
	primitives now available in pkgsrc.

    (7) Move the file compression logic into a separate script
	"doc-compress" that compresses or decompresses files while
	minding symlinks.  This script is now called by bsd.pkg.mk
	to do the "autmoatic man page handling".  In the future,
	it will also handle the "automatic info page handling" and
	possible others.

In general, the idea is to move stuff out of the Makefiles and into
separate files where we don't need to worry about quoting rules
and where each file can have a separate history of commits.  This
simplifies the makefile logic (especially in terms of readability)
and also simplifies maintenance of the code.
2006-01-12 23:43:56 +00:00