>Number:         32669
>Category:       pkg
>Synopsis:       info files not packaged correctly
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 30 16:30:00 +0000 2006
>Originator:     Johan Danielsson
>Release:        NetBSD 3.0
>Organization:
	<organization of PR author (multiple lines)>
>Environment:
	<The following information is extracted from your kernel. Please>
	<append output of "ldd", "ident" where relevant (multiple lines).>
System: NetBSD shoal.pdc.kth.se 3.0 NetBSD 3.0 (SHOAL) #62: Mon Jan 30 10:07:28 CET 2006 joda@shoal.pdc.kth.se:/usr/src/sys/arch/i386/compile/SHOAL i386
Architecture: i386
Machine: i386
>Description:

Since the automatic PLIST info-file handling went in, packages (such
as emacs) does not packages correctly. The problem is that it
(plist-info.awk) assumes that info-files all end in .info, which they
do not.

>How-To-Repeat:

$ cd editors/emacs
$ make install
$ pkg_info -L emacs | grep info/emacs
$ ls /usr/pkg/info/emacs*

>Fix:

This seems to help the emacs situation, but I haven't really tested it
with anything else.

--- plist-info.awk.~1.1.~       2006-01-13 00:43:57.000000000 +0100
+++ plist-info.awk      2006-01-30 17:16:27.000000000 +0100
@@ -73,13 +73,17 @@
 ### For each info page entry, print all of the installed info sub-pages
 ### associated with that entry.
 ###
-/^[^@]/ && /^info\/[^\/]*\.info(\.gz)?$/ {
+/^[^@]/ && /^info\/[^\/]*(\.info)?(\.gz)?$/ {
        sub("^info/", INFO_DIR "/")
        cmd = TEST " -f " PREFIX "/" $0
        if (system(cmd) == 0) {
                sub("\.gz$", "")
+               base=$0
                cmd = "cd " PREFIX " && " LS " -1 " $0 "*"
                while (cmd | getline) {
+                       if($0 !~ base "(\.gz)?$" && $0 !~ base "-[0-9]+(\.gz)?$\
")
+                               continue;
+
                        #if ((MANZ ~ /[yY][eE][sS]/) && ($0 !~ /\.gz$/)) {
                        #       $0 = $0 ".gz"
                        #} else if ((MANZ !~ /[yY][eE][sS]/) && ($0 ~ /\.gz$/))\
 {

>Unformatted:
 	<Please check that the above is correct for the bug being reported,>
 	<and append source date of snapshot, if applicable (one line).>