From 762ed7e57c855873f2bd81a8e03ce49622c25682 Mon Sep 17 00:00:00 2001
From: torstenb <torstenb@FreeBSD.org>
Date: Tue, 19 Nov 1996 11:16:45 +0000
Subject: libident is no longer optional

---
 mail/smail/Makefile          | 6 ++----
 mail/smail/files/freebsd2.0  | 2 +-
 mail/smail/scripts/configure | 6 +-----
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'mail')

diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 0b21a8d..42987c8 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.14 1996/11/17 23:42:40 torstenb Exp $
+# $Id: Makefile,v 1.15 1996/11/18 09:02:59 torstenb Exp $
 #
 
 DISTNAME=	smail-3.2
@@ -12,9 +12,7 @@ MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-.if defined(USE_IDENT)
-DEPENDS=	${PORTSDIR}/security/libident
-.endif
+BUILD_DEPENDS=	${PREFIX}/lib/libident.a:${PORTSDIR}/security/libident
 
 INSTALL_TARGET=	install installman
 
diff --git a/mail/smail/files/freebsd2.0 b/mail/smail/files/freebsd2.0
index 6ebe7a2..c738e95 100644
--- a/mail/smail/files/freebsd2.0
+++ b/mail/smail/files/freebsd2.0
@@ -39,7 +39,7 @@ LIB_DIR=!!PREFIX!!/etc/smail
 UTIL_BIN_DIR=!!PREFIX!!/libexec/smail
 
 # Enable rfc1413 (ident protocol) and ESMTP sending support (EHLO)
-HAVE=$HAVE:EHLO
+HAVE=$HAVE:EHLO:RFC1413
 
 # NOBODY - a user with few access capabilities
 NOBODY=nobody
diff --git a/mail/smail/scripts/configure b/mail/smail/scripts/configure
index 4d5eed6..5b0c85d 100644
--- a/mail/smail/scripts/configure
+++ b/mail/smail/scripts/configure
@@ -1,10 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.1.1.1 1994/10/23 01:22:35 torstenb Exp $
+# $Id: configure,v 1.2 1996/11/17 23:43:03 torstenb Exp $
 
 sed <${FILESDIR}/EDITME >${WRKSRC}/conf/EDITME s+!!PREFIX!!+$PREFIX+g
 sed <${FILESDIR}/freebsd2.0 >${WRKSRC}/conf/os/freebsd2.0 s+!!PREFIX!!+$PREFIX+g
-
-if [ $USE_IDENT ]; then
-	echo >>${WRKSRC}/conf/os/freebsd2.0 HAVE=\$HAVE:RFC1413
-fi
-- 
cgit v1.1