Enable PAM support under Linux and NetBSD if available.

Bump package revision because of this change.

4 files changed, 53 insertions, 21 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 75c9bcaf6d4..05e55b47eaf 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2006/07/26 20:00:27 jlam Exp $
+# $NetBSD: Makefile,v 1.112 2006/09/11 13:44:27 tron Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -7,7 +7,7 @@
 
 DISTNAME=       imap-2004g
 PKGNAME=        ${DISTNAME:S/-/-uw-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -28,7 +28,11 @@ LTINSTALL_LIB=		${LIBTOOL} --mode=install ${INSTALL_LIB}
 # Each platform has its own special target in the imap Makefiles.
 OPSYSVARS+=		BUILD_TARGET
 BUILD_TARGET.SunOS=	gso
+.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
+BUILD_TARGET.Linux=	lnp
+.else
 BUILD_TARGET.Linux=	slx
+.endif
 BUILD_TARGET.Darwin=	osx
 .if ${OPSYS} == "IRIX"
 .  if ${OS_VERSION} >= 6.5
@@ -39,8 +43,10 @@ BUILD_TARGET.IRIX=	sgi
 .endif
 BUILD_TARGET.OSF1=	osf
 BUILD_TARGET.OpenBSD=	bso
+.if ${OPSYS} == NetBSD && exists(/usr/include/security/pam_appl.h)
+BUILD_TARGET.NetBSD=	nep
+.endif
 BUILD_TARGET.*=		neb
-
 MESSAGE_SRC=		${PKGDIR}/MESSAGE
 
 .include "options.mk"
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 9c6175a1fda..50ada3c58a0 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2006/08/29 23:53:55 markd Exp $
+$NetBSD: distinfo,v 1.31 2006/09/11 13:44:27 tron Exp $
 
 SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066
 RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687
 Size (imap-2004g.tar.Z) = 2246713 bytes
-SHA1 (patch-aa) = 5e7dd27e949a191ddaeac9d7ba1db4e0fd258bc8
-SHA1 (patch-ab) = 8f64017296d11bd57d57f1221c55fec278be20b3
+SHA1 (patch-aa) = e18ec6b1674e71865a8aabe41b5da24c572edcb5
+SHA1 (patch-ab) = fbe43bfc811058433936e6eb61bfc7d69f819e45
 SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8
 SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727
 SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 331474cf76a..3068afeb1fc 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.17 2006/07/26 20:00:27 jlam Exp $
+$NetBSD: patch-aa,v 1.18 2006/09/11 13:44:27 tron Exp $
 
---- Makefile.orig	2005-04-30 16:50:20.000000000 -0400
-+++ Makefile
-@@ -474,9 +474,6 @@ sslunix sslsco:
+--- Makefile.orig	2005-04-30 21:50:20.000000000 +0100
++++ Makefile	2006-09-11 14:18:20.000000000 +0100
+@@ -296,7 +296,7 @@
+ 
+ # Note on SCO you may have to set LN to "ln".
+ 
+-a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
++a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
+ 	$(BUILD) BUILDTYPE=$@
+ 
+ # If you use sv4, you may find that it works to move it to use the an process.
+@@ -474,9 +474,6 @@
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -12,7 +21,7 @@ $NetBSD: patch-aa,v 1.17 2006/07/26 20:00:27 jlam Exp $
  
  sslnone:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -489,9 +486,6 @@ sslnone:
+@@ -489,9 +486,6 @@
  	@echo ++ SSLTYPE=nopwd
  	@echo + You must also have OpenSSL or equivalent installed.
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index af503462a5e..7840e2dc203 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
+$NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $
 
---- src/osdep/unix/Makefile.orig	2005-04-30 16:51:13.000000000 -0400
-+++ src/osdep/unix/Makefile
-@@ -124,7 +124,7 @@ DEFAULTDRIVERS=imap nntp pop3 mh mx mbx 
+--- src/osdep/unix/Makefile.orig	2005-04-30 21:51:13.000000000 +0100
++++ src/osdep/unix/Makefile	2006-09-11 14:19:56.000000000 +0100
+@@ -124,7 +124,7 @@
  
  # Normally no need to change any of these
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -403,9 +403,9 @@ gso:	os_sol.h	# GCC Solaris
+@@ -403,9 +403,9 @@
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
  	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -495,9 +495,9 @@ neb:	# NetBSD
+@@ -495,9 +495,9 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -35,7 +35,24 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -549,7 +549,7 @@ osx:	# Mac OS X
+@@ -510,6 +510,16 @@
+ 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+ 	 RANLIB=true CC=/usr/abiccs/bin/cc
+ 
++nep:	# NetBSD with PAM
++	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
++	 CHECKPW=pam \
++	 CRXTYPE=nfs \
++	 SPOOLDIR=/var \
++	 ACTIVEFILE=/var/news/db/active \
++	 RSHPATH=/usr/bin/rsh \
++	 BASECFLAGS="-pipe" \
++	 BASELDFLAGS="-lpam"
++
+ nto:	# QNX Neutrino RTP
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+ 	 CRXTYPE=nfs \
+@@ -549,7 +559,7 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
@@ -44,7 +61,7 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  
  ptx:	# PTX
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -811,7 +811,7 @@ $(ARCHIVE): $(BINARIES)
+@@ -811,7 +821,7 @@
  	@$(SH) ARCHIVE
  
  .c.o:
@@ -53,7 +70,7 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  
  
  # Cleanup
-@@ -869,7 +869,7 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
+@@ -869,7 +879,7 @@
  	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
  	@echo is not installed on your system.  Either install OpenSSL first
  	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
@@ -62,7 +79,7 @@ $NetBSD: patch-ab,v 1.20 2006/08/29 23:53:55 markd Exp $
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
  	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
-@@ -924,7 +924,7 @@ onceenv:
+@@ -924,7 +934,7 @@
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS