change special sendmail installation. now mail/sendmail includes

WIDE patch, mail/smtpfeed can simply depend on mail/sendmail.

5 files changed, 16 insertions, 79 deletions

diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 9fea8473237..fd17c2c01ba 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.3 1999/12/27 09:34:13 itojun Exp $
-# KAME $Id: Makefile,v 1.3 1999/12/27 09:34:13 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 18:02:50 itojun Exp $
+# KAME $Id: Makefile,v 1.4 2000/01/02 18:02:50 itojun Exp $
 # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp
 #
 
@@ -9,28 +9,19 @@ MASTER_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ \
 		ftp://ftp.sendmail.org/ucb/src/sendmail/ \
 		http://freefall.freebsd.org/~itojun/distfiles/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SENDMAIL}${EXTRACT_SUFX} \
-		${SENDMAILPATCH}.patch.gz
 
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.kyoto.wide.ad.jp/mta/sendmail.html#smtpfeed
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${SENDMAIL}${EXTRACT_SUFX}
-PATCH_SENDMAIL_ARGS=	-d ${WRKSRC_SENDMAIL} -E ${PATCH_DIST_STRIP}
-NO_PACKAGE=	"complex configuration for sendmail.cf needed"
-
-SENDMAILVER=	8.9.3
-SENDMAIL=	sendmail.${SENDMAILVER}
-SENDMAILDIR=	sendmail-${SENDMAILVER}
-SENDMAILPATCH=	sendmail893+3.2W
-WRKSRC_SMTPFEED=	${WRKSRC}
-WRKSRC_SENDMAIL=	${WRKDIR}/${SENDMAILDIR}/src
+DEPENDS+=	sendmail-*:../../mail/sendmail
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec
 # use bind8?
 #CONFIGURE_ARGS+=	--with-bind8
 
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
+
 DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 	OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL SIGNAL.j TODO
 DOCDIR=	${PREFIX}/share/doc/smtpfeed
@@ -39,22 +30,15 @@ BUILD_DEFS+=    USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
 
-post-patch:
-	@${ECHO_MSG} "===>  Applying smtpfeed patch ${SENDMAILPATCH} to ${SENDMAIL}"
-	@(cd ${_DISTDIR}; for i in ${SENDMAILPATCH}.patch.gz; do \
-		${GZCAT} $$i | ${PATCH} ${PATCH_SENDMAIL_ARGS}; \
-	done)
-	${CP} -f ${FILESDIR}/site.config ${WRKSRC_SENDMAIL}
-	${CP} -f ${FILESDIR}/site.config-v6.kame ${WRKSRC_SENDMAIL}
-
-post-build:
-	@${ECHO_MSG} "===>  Building patched ${SENDMAIL}"
 .if defined(USE_INET6) && ${USE_INET6} == YES
-	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail -f site.config-v6.kame)
-.else
-	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail -f site.config)
+CONFIGURE_ARGS+=--enable-ipv6
 .endif
 
+post-build:
+	${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
+		-e 's#@@PREFIX@@#${PREFIX}#g' \
+		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
@@ -62,12 +46,5 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \
 	done
 .endif
-	@${SED} -e 's#/usr/pkg#${PREFIX}#' ${PKGDIR}/MESSAGE
-
-backup-sendmail:
-	(cd /usr/libexec/sendmail; ${MV} sendmail sendmail.dist)
-
-install-sendmail:
-	(cd ${WRKSRC_SENDMAIL}; sh makesendmail install)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/smtpfeed/files/site.config b/mail/smtpfeed/files/site.config
deleted file mode 100644
index a718e764770..00000000000
--- a/mail/smtpfeed/files/site.config
+++ /dev/null
@@ -1,2 +0,0 @@
-define(`confLINKS', `')
-define(`confMBINDIR', ``/usr/libexec/sendmail'')
diff --git a/mail/smtpfeed/files/site.config-v6.kame b/mail/smtpfeed/files/site.config-v6.kame
deleted file mode 100644
index 5d0e8b69fa9..00000000000
--- a/mail/smtpfeed/files/site.config-v6.kame
+++ /dev/null
@@ -1,3 +0,0 @@
-PREPENDDEF(`confENVDEF', ``-DNETINET6=1'')
-define(`confLINKS', `')
-define(`confMBINDIR', ``/usr/libexec/sendmail'')
diff --git a/mail/smtpfeed/patches/patch-ab b/mail/smtpfeed/patches/patch-ab
deleted file mode 100644
index 2cb86975e01..00000000000
--- a/mail/smtpfeed/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/29 08:06:32 itojun Exp $
-
---- configure.in-	Sun May 16 23:33:06 1999
-+++ configure.in	Sun May 16 23:33:28 1999
-@@ -221,7 +221,7 @@
- [#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
--#include <resolv.h>], [_res_ext.nsaddr_list[0].ss_family = 1;],
-+#include <resolv.h>], [_res_ext.nsaddr_list[0].__ss_family = 1;],
- 	[AC_DEFINE(RESOLVER_KAME)
- 	resolver=kame],
- 	[AC_TRY_COMPILE(dnl
---- configure-	Sun May 16 23:33:04 1999
-+++ configure	Sun May 16 23:33:17 1999
-@@ -1371,7 +1371,7 @@
- #include <netinet/in.h>
- #include <resolv.h>
- int main() {
--_res_ext.nsaddr_list[0].ss_family = 1;
-+_res_ext.nsaddr_list[0].__ss_family = 1;
- ; return 0; }
- EOF
- if { (eval echo configure:1378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
diff --git a/mail/smtpfeed/pkg/MESSAGE b/mail/smtpfeed/pkg/MESSAGE
index 0862c5f41cb..119f76db6d9 100644
--- a/mail/smtpfeed/pkg/MESSAGE
+++ b/mail/smtpfeed/pkg/MESSAGE
@@ -1,19 +1,8 @@
 **************************************************************
-smtpfeed is installed into /usr/pkg/libexec/smtpfeed.
-You'll need to perform 3 steps, (a) to (c), to make smtpfeed
-work:
-	(a) replace /etc/sendmail.cf
-	(b) replace sendmail with the patched sendmail
-	(c) setting up /etc/syslog.conf
+Executable for @@PKGNAME@@ is installed into
+@@PREFIX@@/libexec/smtpfeed.
 
-(a) depends on what kind of configuration tool you are using
-with sendmail.cf.  Read through documentation in
-/usr/pkg/share/doc/smtpfeed for details.
-(b) can be done by performing "make install-sendmail" in the
-port directory.
-WARNING: Existing sendmail (/usr/libexec/sendmail/sendmail) will be
-overwritten right away!  Backup by yourself for safety.
-"make backup-sendmail" would copy old one to sendmail.dist.
-(c) is the easiest of the three items; see file named INSTALL
-in /usr/pkg/share/doc/smtpfeed.
+You'll need to prepare (1) sendmail with WIDE patch applied,
+and (2) properly configured sendmail.cf.
+(1) is included in mail/sendmail pkgsrc.
 **************************************************************