So that I don't lose all this work, stash the work-in-progress derecursion
cleanup onto the tv-derecurse branch (only branched in pkgsrc/mk).
Add workaround for pkg/28392 in recurse-* targets.
Rearrange some more bits visually.
Factor out PLIST generation and handling into its own morsel that's a
little easier to handle and maintain.
Factor out package data export bits which are not used in the normal build
process into a new fragment, bsd.pkg.data.mk.

Fix some include ordering so that most of the dependency logic works
correctly again (though fetch-list is still broken).
Move "package-name" back to bsd.pkg.mk, as it is needed there.
Make dependency calculation work correctly for "print-summary-data", and
thus for "readme".
merge from HEAD
Merge from HEAD.
merge from HEAD
merge from HEAD
sync with HEAD
Remove the cookie before creating it, so that su-created cookies can
be clobbered by non-su operations.
Merge from HEAD.
sync with HEAD
sync with HEAD
Pullup ticket 347 - requested by Matthias Scheler
security fix for ethereal

Revisions pulled up:
- pkgsrc/net/ethereal/Makefile		1.103
- pkgsrc/net/ethereal/distinfo		1.33, 1.35
- pkgsrc/net/ethereal/patches/patch-aa	1.11
- pkgsrc/net/ethereal/patches/patch-ab	1.3

   Module Name:		pkgsrc
   Committed By:	salo
   Date:		Mon Jan 31 22:53:54 UTC 2005

   Modified Files:
   	pkgsrc/net/ethereal: distinfo
   Added Files:
   	pkgsrc/net/ethereal/patches: patch-aa

   Log Message:
   Remove attributes in prototype for unnamed pointers.
   ethereal svn version is laready fixed.

   From PR pkg/29065 by Greg A. Woods.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu Mar 10 10:05:33 UTC 2005

   Modified Files:
   	pkgsrc/net/ethereal: Makefile distinfo
   Added Files:
   	pkgsrc/net/ethereal/patches: patch-ab

   Log Message:
   Fix security vulernability in dissector for CDMA2000 A11 packets.
   Bump package revision.
#347
Pullup ticket 333 - requested by Adrian Portelli
security fix for imap-uw

Revisions pulled up:
- pkgsrc/mail/imap-uw/Makefile		1.88-1.90
- pkgsrc/mail/imap-uw/PLIST		1.9
- pkgsrc/mail/imap-uw/distinfo		1.19
- pkgsrc/mail/imap-uw-utils/DESCR	1.2
- pkgsrc/mail/imap-uw-utils/Makefile	1.20
- pkgsrc/mail/imap-uw-utils/PLIST	1.2
- pkgsrc/mail/imap-uw-utils/distinfo	1.5

   Module Name:	pkgsrc
   Committed By:	abs
   Date:		Mon Jan 24 09:03:48 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile distinfo

   Log Message:
   Update imap-uw to 2004c1

   imap-2004c:
       fixes to quoted-printable encoding and CRAM-MD5 authentication.
       NNTP proxy in imapd now supports the LIST and LSUB commands.

   imap-2004b:
       There are new ports for Solaris with Blastwave Community Open
       Source Software (gcs) and Mandrake Linux (lmd).

       SET_SNARFINTERVAL now controls how frequently local drivers
       will move new mail from the mail spool as well as from a
       maildrop.  Maildrops are still tied to a minimum interval of
       1 minute, but there is now no minimum for the spool file.

       Character set conversions now map non-breaking space to space
       if the destination character set doesn't have nbsp.  JIS Roman
       yen sign is now mapped to Unicode yen sign.
---
   Module Name:	pkgsrc
   Committed By:	abs
   Date:		Mon Jan 31 11:38:22 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile

   Log Message:
   fix my previous attempt to clarify a comment at the start
---
   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Sat Mar  5 22:01:47 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile PLIST

   Log Message:
   - Fix builds on NetBSD 1.6 due to Kerberos/OpenSSL 0.9.7 issues
   - Included some utilities in the install that were once a part of the
     imap-uw-utils package but are now a part of this package
   - ok'ed kim@
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sun Mar  6 14:37:16 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw-utils: DESCR Makefile PLIST distinfo

   Log Message:
   - Update to 20050108 to avoid conflicts with imap-uw package
   - Issue spotted by diro (at) nixsys.bz in PR #28966

   This distribution now contains two unsupported programs, icat and ifrom,
   which may be of use to some sites.

   The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
   programs have been replaced with the mailutil program, which is
   included in the mail/imap-uw package.

   The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
   package.
#333
Pullup ticket 349 - requested by Lubomir Sedlacik
security fix for libexif

Revisions pulled up:
- pkgsrc/graphics/libexif/Makefile		1.22
- pkgsrc/graphics/libexif/buildlink3.mk		1.6
- pkgsrc/graphics/libexif/distinfo		1.12
- pkgsrc/graphics/libexif/patches/patch-ab	1.1


    Module Name:    pkgsrc
    Committed By:   adam
    Date:           Thu Mar 10 19:22:22 UTC 2005

    Modified Files:
            pkgsrc/graphics/libexif: distinfo
    Added Files:
            pkgsrc/graphics/libexif/patches: patch-ab

    Log Message:
    Added a patch to fix buffer overflow:

      * SECURITY UPDATE: Fix buffer overflow.
      * libexif/exif-data.c: Add buffer size checks in several places before
        trying to access it.
      * Thanks to Sylvain Defresne for spotting this and the patch.
      * References:
        https://bugzilla.ubuntulinux.org/show_bug.cgi?id=7152

    Thanks to wiz@ for heads-up. :)

    ----

    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Thu Mar 10 22:21:56 UTC 2005

    Modified Files:
            pkgsrc/graphics/libexif: Makefile buildlink3.mk

    Log Message:
    Bump PKGREVISION and BUILDLINK_RECOMMENDED for the security fix. (hi adam!)