* Split the MESSAGE file into two parts, one of which only shows up

  if "ssl" is a package option.

* Stop the abuse of BUILD_TARGET and use MAKE_FLAGS instead.  Also,
  use OPSYSVARS to simplify the specification of the correct BUILD_TARGET
  for each platform.

* Make use of the EXTRASPECIALS variable used by imap makefiles to pass
  special MAKE_FLAGS settings through to all recursive make processes.
  This gets rid of some MAKE_ENV statements.

* Split off the special alpha-codegen hack into a hacks.mk file.

* Do man page fixups at post-build time, not post-extract time.  This
  leaves the files pristine for possible patching.

* Add back the special handling if IMAP_UW_MAILSPOOLHOME is defined.
  It was accidentally removed in patch-am when the whoson modifications
  were added.  Move the modifications to the configure phase instead
  of post-patch so that the modifications aren't accidentally picked
  up by mkpatches.

* Instead of listing each Makefile that needs the sed modification
  s/c-client.a/libc-client.la/ and modifying them at post-extract
  time, simply create patches for them.

* Instead of listing each header file to be installed, just derive
  the list from the PLIST.

* Make the libtoolification a bit more transparent by patching libtool
  references directly into the imap makefiles.

* Drop the -limapuw -> -lc-client buildlink transform that was only
  needed for much older versions of the imap-uw package, and stop
  installing libimapuw.*.  All dependents of imap-uw already correctly
  use -lc-client.

* Fix the handling of the kerberos package option so that we can use
  the pkgsrc Kerberos 5 packages instead of only using the native
  ones.

* Properly document the options.mk file.

Bump the PKGREVISION for the libimapuw.* changes and for the
IMAP_UW_MAILSPOOLHOME fixes.  The rest of the changes are all
pkgsrc-related and don't really affect the binary package.

1 files changed, 12 insertions, 2 deletions

diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
index bd536d6ed28..14b4c35a903 100644
--- a/mail/imap-uw/patches/patch-am
+++ b/mail/imap-uw/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.4 2004/10/11 16:56:28 abs Exp $
+$NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $
 
---- src/osdep/unix/env_unix.c.orig	2004-08-22 19:54:29.000000000 +0100
+--- src/osdep/unix/env_unix.c.orig	2004-09-13 17:31:19.000000000 -0400
 +++ src/osdep/unix/env_unix.c
 @@ -21,6 +21,9 @@
  #include <grp.h>
@@ -29,3 +29,13 @@ $NetBSD: patch-am,v 1.4 2004/10/11 16:56:28 abs Exp $
    syslog (level|LOG_AUTH,"Login %s user=%.64s auth=%.64s host=%.80s",err,
  	  user,(authuser && *authuser) ? authuser : user,tcp_clienthost ());
    sleep (3);			/* slow down possible cracker */
+@@ -830,7 +841,8 @@ char *sysinbox ()
+ {
+   char tmp[MAILTMPLEN];
+   if (!sysInbox) {		/* initialize if first time */
+-    sprintf (tmp,"%s/%s",MAILSPOOL,myusername ());
++    /* Substitute SPOOLDIR and MAILBOX appropriately for pkgsrc. */
++    sprintf (tmp,"%s/%s",@SPOOLDIR@,@MAILBOX@);
+     sysInbox = cpystr (tmp);	/* system inbox is from mail spool */
+   }
+   return sysInbox;