Update to version 3.2.1

Changes:

- convert to PKG_OPTIONS framework
- make gnutls default option, ssl optional

3.2.1:
======
- fixed handling of file names starting with a tilde in sftp protocol.
- fixed minor problem with `lftp -u user --help'.
- fixed compilation with modules.
- fixed compilation without OpenSSL and GnuTLS.
- fixed compilation with certain compiler versions.
- relaxed version requirement on GnuTLS.

3.2.0:
======
- added support for gnutls library. Now OpenSSL is only used if explicitly
  configured with option --with-openssl, and by default gnutls is used.
- added parser for AS/400 ftp listing.
- fixed a coredump in mirror when symbolic link target is unknown.

3 files changed, 31 insertions, 8 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index f1d8fb6f720..59c262cf83c 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/04/18 16:19:16 salo Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/30 16:01:40 salo Exp $
 #
 
-DISTNAME=		lftp-3.1.3
+DISTNAME=		lftp-3.2.1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
 			ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
@@ -26,7 +26,8 @@ USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
 
 SHLIBTOOL_OVERRIDE=	libtool
 
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+.include "options.mk"
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-modules
 
@@ -44,6 +45,6 @@ post-install:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 33ac5fee171..138e42dae45 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2005/04/18 16:19:16 salo Exp $
+$NetBSD: distinfo,v 1.32 2005/05/30 16:01:40 salo Exp $
 
-SHA1 (lftp-3.1.3.tar.bz2) = dc065707ec6b5c88d7636deae3f7dbc55899d2e3
-RMD160 (lftp-3.1.3.tar.bz2) = e4ca381308921502f30f401156ca8d25aed38d1f
-Size (lftp-3.1.3.tar.bz2) = 1232798 bytes
+SHA1 (lftp-3.2.1.tar.bz2) = 7bd0ecca43e97887d9b0cd80c269ecd313f5e3f0
+RMD160 (lftp-3.2.1.tar.bz2) = cfad943ff48a718a9bb759590157ea0d3faf6ffc
+Size (lftp-3.2.1.tar.bz2) = 1238136 bytes
 SHA1 (patch-aa) = 07b287f211e1fa87ce319ccc5f9746ebc07da632
 SHA1 (patch-ab) = d230522c60786a2bcbce346419d8dfce412578d3
 SHA1 (patch-ac) = 8000bf8b44b39b7f87e9d7c89bcb513aa5150753
diff --git a/net/lftp/options.mk b/net/lftp/options.mk
new file mode 100644
index 00000000000..13f62dffcf3
--- /dev/null
+++ b/net/lftp/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2005/05/30 16:01:40 salo Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lftp
+PKG_SUPPORTED_OPTIONS=	gnutls ssl
+PKG_DEFAULT_OPTIONS=	gnutls
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls) && !empty(PKG_OPTIONS:Mssl)
+PKG_FAIL_REASON+=	"Options \"gnutls\" and \"ssl\" are mutually exclusive."
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=	--without-openssl
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--without-gnutls
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+.include "../../security/openssl/buildlink3.mk"
+.endif