summaryrefslogtreecommitdiff
path: root/mail/sendmail
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-09-25 20:05:23 +0000
committerjlam <jlam@pkgsrc.org>2007-09-25 20:05:23 +0000
commit013d10861df1d2ea8403854cef365d104c8bf1ae (patch)
tree4fb4633d881c5002f8fcf7ba70d0c5c3139bc973 /mail/sendmail
parent33a60af8aed57d30c032806bb2c90173b6a04e3c (diff)
downloadpkgsrc-013d10861df1d2ea8403854cef365d104c8bf1ae.tar.gz
The sendmail and libmilter should have different sets of options. In
particular, libmilter does *not* support "ldap", "sasl", etc. which are supported by only sendmail. Do this through the following: (1) Create libmilter/options.mk with support for the "inet6" option. (2) Drop inclusion of options.mk from sendmail/Makefile.common and move it to libmilter/Makefile and sendmail/Makefile. While here, properly support IPv6 on FreeBSD, which like DragonFly has getipnodebyname() in libc. As a result of these changes, libmilter will no longer depend on cyrus-sasl or openssl or openldap-client depending on what is set in PKG_DEFAULT_OPTIONS. Bump the PKGREVISION of libmilter to 1 due to the changed dependency list. No change to sendmail as the binary package does not change.
Diffstat (limited to 'mail/sendmail')
-rw-r--r--mail/sendmail/Makefile7
-rw-r--r--mail/sendmail/Makefile.common14
2 files changed, 10 insertions, 11 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 8f5d75096b5..ee3881ba450 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.100 2007/06/19 17:10:55 jnemeth Exp $
-
-.include "../../mail/sendmail/Makefile.common"
+# $NetBSD: Makefile,v 1.101 2007/09/25 20:05:23 jlam Exp $
PKGNAME= sendmail-${DIST_VERS}
COMMENT= The well known Mail Transport Agent
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
+.include "options.mk"
+.include "../../mail/sendmail/Makefile.common"
+
MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 7510d70707c..0f9af18d9f9 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2007/04/26 06:26:27 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.43 2007/09/25 20:05:24 jlam Exp $
#
# Makefile fragment shared with libmilter
#
@@ -15,9 +15,9 @@ HOMEPAGE= http://www.sendmail.org/
LICENSE= sendmail-license
-DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo
-FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
-PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
+DISTINFO_FILE= ${.CURDIR}/../../mail/sendmail/distinfo
+FILESDIR= ${.CURDIR}/../../mail/sendmail/files
+PATCHDIR= ${.CURDIR}/../../mail/sendmail/patches
DIST_VERS= 8.14.1
@@ -33,9 +33,6 @@ WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
USE_TOOLS+= gm4
MAKE_ENV+= M4=${TOOLS_M4:Q}
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
.PHONY: make-sendmail-siteconfig
make-sendmail-siteconfig:
${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
@@ -43,7 +40,8 @@ make-sendmail-siteconfig:
.if !empty(PKG_OPTIONS:Minet6)
${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-. if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS" && ${OPSYS} != "DragonFly"
+. if (${OPSYS} != "SunOS") && (${OPSYS} != "BSDOS") && \
+ (${OPSYS} != "DragonFly") && (${OPSYS} != "FreeBSD")
${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
. endif
.endif