Fetchmail did not compile on i386 1.4Y with crypto-us. Made SSL optional.

2 files changed, 20 insertions, 4 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 64436f3f927..027bf81d68d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2000/05/02 08:15:01 tron Exp $
+# $NetBSD: Makefile,v 1.72 2000/05/21 19:19:34 kim Exp $
 #
 
 DISTNAME=       fetchmail-5.3.8
@@ -13,8 +13,7 @@ HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
 GNU_CONFIGURE=	yes
-USE_SSL=	yes
-CONFIGURE_ARGS+=--without-hesiod --with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=--without-hesiod
 CONFIGURE_ENV+=  LDFLAGS="${CFLAGS}"
 
 BUILD_DEFS+=	USE_INET6
@@ -22,6 +21,18 @@ RESTRICTED=	"Crypto; export-controlled"
 
 .include "../../mk/bsd.prefs.mk"
 
+FETCHMAIL_USE_SSL?=YES
+
+.if defined(FETCHMAIL_USE_SSL) && ${FETCHMAIL_USE_SSL} == YES
+USE_SSL=	yes
+CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=--without-ssl
+.else
+.endif
+
+BUILD_DEFS+=	FETCHMAIL_USE_SSL
+
 .if defined(KERBEROS) && ${KERBEROS} == 4
 USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-kerberos=yes
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 9d13ab7be92..6f3be184a30 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.140 2000/05/20 19:44:15 jlam Exp $
+# $NetBSD: mk.conf.example,v 1.141 2000/05/21 19:19:33 kim Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -295,6 +295,11 @@
 # Possible: yes, no, not defined, athena, lucid, motif
 # Default: not defined
 
+#FETCHMAIL_USE_SSL=	YES
+# Enable SSL in fetchmail (for pop and imap connections)
+# Possible: YES, NO
+# Default: YES
+
 #IRRD_USE_PGP=
 # Used by irrd package to specify the version of PGP to use, if any.
 # Possible: 5, 2, not defined