summaryrefslogtreecommitdiff
path: root/mail/sendmail812
diff options
context:
space:
mode:
authoradrianp <adrianp>2005-03-30 21:54:19 +0000
committeradrianp <adrianp>2005-03-30 21:54:19 +0000
commitc48d7a8b76c2bcb8928ce2e1b424672a3632cc8c (patch)
tree40b93aa378092c8614b3b4b1172a01ab2bea7513 /mail/sendmail812
parent9f5e5fd8462de0f89c1fed30ec4ee5ad07f71781 (diff)
downloadpkgsrc-c48d7a8b76c2bcb8928ce2e1b424672a3632cc8c.tar.gz
- Finish off jlam@'s work removing SASL v1 from pkgsrc
Diffstat (limited to 'mail/sendmail812')
-rw-r--r--mail/sendmail812/Makefile5
-rw-r--r--mail/sendmail812/Makefile.common4
-rw-r--r--mail/sendmail812/files/site.config.m4-sasl5
3 files changed, 3 insertions, 11 deletions
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 1054fceeaac..b4444780012 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/28 09:39:57 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/30 21:54:19 adrianp Exp $
.include "../../mail/sendmail812/Makefile.common"
@@ -62,9 +62,6 @@ post-patch: make-sendmail-siteconfig
.if defined(USE_SASL2) && ${USE_SASL2} == YES
${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
${ECHO} -n ' SASL2' >>${DESCR_SRC}
-.elif defined(USE_SASL) && ${USE_SASL} == YES
- ${CAT} ${FILESDIR}/site.config.m4-sasl >>${SITECONFIG}
- ${ECHO} -n ' SASL' >>${DESCR_SRC}
.endif
${ECHO} >>${DESCR_SRC}
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 848fe0ef3ed..0f0383847d4 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/03/25 10:45:44 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/03/30 21:54:19 adrianp Exp $
#
# Makefile fragment shared with libmilter
#
@@ -26,7 +26,7 @@ MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
BUILD_DEFS+= USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
- USE_SASL USE_SASL2 USE_STARTTLS USE_DB4
+ USE_SASL2 USE_STARTTLS USE_DB4
DESCR_SRC= ${WRKDIR}/.DESCR_SRC
WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
diff --git a/mail/sendmail812/files/site.config.m4-sasl b/mail/sendmail812/files/site.config.m4-sasl
deleted file mode 100644
index f586adc72af..00000000000
--- a/mail/sendmail812/files/site.config.m4-sasl
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-sasl,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable SASL
-APPENDDEF(`confENVDEF', `-DSASL')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')