Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mail/sendmail/Makefile.common,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/sendmail/Makefile.common,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pkgsrc/mail/sendmail/Makefile.common	2004/05/09 21:14:43	1.17
+++ pkgsrc/mail/sendmail/Makefile.common	2004/08/30 20:16:28	1.18
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/05/09 21:14:43 snj Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/08/30 20:16:28 adrianp Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -7,27 +7,25 @@ DISTNAME=	sendmail.${DIST_VERS}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
-		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
+		ftp://ftp.ayamura.org/pub/sendmail/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.sendmail.org/
 
 LICENSE=	no-profit
 
-DISTINFO_FILE?=	${.CURDIR}/../../mail/sendmail/distinfo
-FILESDIR?=	${.CURDIR}/../../mail/sendmail/files
-PATCHDIR?=	${.CURDIR}/../../mail/sendmail/patches
+DISTINFO_FILE?=	${.CURDIR}/../../wip/sendmail813/distinfo
+FILESDIR?=	${.CURDIR}/../../wip/sendmail813/files
+PATCHDIR?=	${.CURDIR}/../../wip/sendmail813/patches
 
-DIST_VERS=	8.12.11
+DIST_VERS=	8.13.1
 
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
 		BUILDLINK_DIR="${BUILDLINK_DIR}"
 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
-DESCR_SRC=	${WRKDIR}/.DESCR_SRC
+BUILD_DEFS+=    SMRSH_CMDDIR
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_BUILDLINK3=	YES
@@ -36,21 +34,27 @@ MAKE_ENV+=	M4="${M4}"
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_OPTIONS.sendmail?=	inet6 tcpwrappers
+
+.include "options.mk"
+
 make-sendmail-siteconfig:
-	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
-	${CHMOD} +w ${SITECONFIG}
-	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
-	${ECHO} '---' >>${DESCR_SRC}
-	${ECHO} -n 'compiled features:' >>${DESCR_SRC}
-.if defined(USE_INET6) && ${USE_INET6} == YES
-	${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
+	@${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
+	@${CHMOD} +w ${SITECONFIG}
+
+.if !empty(PKG_OPTIONS:Minet6)
+	@${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
 .if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS"
-	${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
+	@${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
 .endif
-	${ECHO} -n ' INET6' >>${DESCR_SRC}
 .endif
+
 .if ${OPSYS} == "SunOS"
-	${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
+	@${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
 .endif
-	${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
-	${ECHO} -n ' MILTER' >>${DESCR_SRC}
+
+.if ${OPSYS} == "Linux"
+	@${CAT} ${FILESDIR}/site.config.m4-linux >>${SITECONFIG}
+.endif
+
+	@${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}