From ec4386b06516f840f7ca76be99e60ee908b1eccd Mon Sep 17 00:00:00 2001
From: billf <billf@FreeBSD.org>
Date: Thu, 14 Sep 2000 23:26:02 +0000
Subject: sasl updates

Submitted by:	MAINTAINER

also, change ${SH} to /bin/sh, the former probably doesn't work because
of some bsd.{pre,post}.port.mk thing, but I don't have time to diagnose it.
---
 mail/postfix-current/Makefile       |  4 ++--
 mail/postfix-current/files/patch-ei | 21 +++++++++++++++++++++
 mail/postfix-current/files/patch-ej | 21 +++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 mail/postfix-current/files/patch-ei
 create mode 100644 mail/postfix-current/files/patch-ej

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 1da3f5d719e8..6f73fac6b76b 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -53,7 +53,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libpcre.a
 .if defined(WITH_SASL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libsasl.a:${PORTSDIR}/security/cyrus-sasl
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libsasl.a
+POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libsasl.a -lpam -lcrypt
 .endif
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
@@ -76,7 +76,7 @@ post-patch:
 	${ECHO} "all: default" >> Makefile)
 
 pre-install:
-	@${SH} @${PKGDIR}/INSTALL Postfix PRE-INSTALL
+	@/bin/sh @${PKGDIR}/INSTALL Postfix PRE-INSTALL
 
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
diff --git a/mail/postfix-current/files/patch-ei b/mail/postfix-current/files/patch-ei
new file mode 100644
index 000000000000..f3a0cc82333e
--- /dev/null
+++ b/mail/postfix-current/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
+--- ./smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
+***************
+*** 12,19 ****
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+  #endif
+  
+   /*
+--- 12,19 ----
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+  #endif
+  
+   /*
diff --git a/mail/postfix-current/files/patch-ej b/mail/postfix-current/files/patch-ej
new file mode 100644
index 000000000000..a118090e5548
--- /dev/null
+++ b/mail/postfix-current/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
+--- ./smtp/smtp.h	Thu Sep 14 13:04:53 2000
+***************
+*** 12,19 ****
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl.h>
+! #include <saslutil.h>
+  #endif
+  
+   /*
+--- 12,19 ----
+    * SASL library.
+    */
+  #ifdef USE_SASL_AUTH
+! #include <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+  #endif
+  
+   /*
-- 
cgit