Update to version 1.0.20.

pkgsrc changes:
 o move to bsd.options.mk framework
 o add ldap options

package changes:
 o On MacOS X Panther and Tiger, clients were sometimes rejected when they
   has no reverse DNS entry and DNS resolution was enabled. This has been
   fixed.  Thanks to Yann Thomas Gerard <inside@parasiterecords.com> .
 o The command-line parser was broken on FreeBSD and Solaris in version
   1.0.19. This has also been fixed.

3 files changed, 53 insertions, 30 deletions

diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 68e0aa79130..88918c7e6c0 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/20 11:10:29 cube Exp $
 
-DISTNAME=	pure-ftpd-1.0.19
-PKGREVISION=	1
+DISTNAME=	pure-ftpd-1.0.20
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/		\
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -25,30 +24,7 @@ CONFIGURE_ARGS+=	--with-everything	\
 			--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
-
-.if !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss])
-.  include "../../databases/mysql-client/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-BUILD_DEFS+=		PURE_FTPD_USE_MYSQL
-.endif
-
-.if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
-.  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pgsql
-BUILD_DEFS+=		PURE_FTPD_USE_PGSQL
-.endif
-
-.if !empty(PURE_FTPD_USE_TLS:M[Yy][Ee][Ss])
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-tls
-BUILD_DEFS+=		PURE_FTPD_USE_TLS
-.endif
-
-.if !empty(PURE_FTPD_USE_VIRTUAL_CHROOT:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-virtualchroot
-BUILD_DEFS+=		PURE_FTPD_USE_VIRTUAL_CHROOT
-.endif
+.include "options.mk"
 
 RCD_SCRIPTS=	pure_ftpd
 
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index 7c40d910bad..b5afef42db7 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/07/20 22:04:15 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/10/20 11:10:29 cube Exp $
 
-SHA1 (pure-ftpd-1.0.19.tar.gz) = 8b29ac6afe06fd10b36fa2b466006f922a3229de
-Size (pure-ftpd-1.0.19.tar.gz) = 538454 bytes
+SHA1 (pure-ftpd-1.0.20.tar.gz) = cf7ac48ebb720d718b314c23ce96c6976adbd617
+Size (pure-ftpd-1.0.20.tar.gz) = 561412 bytes
diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk
new file mode 100644
index 00000000000..9ddf27fdfd4
--- /dev/null
+++ b/net/pure-ftpd/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2004/10/20 11:10:29 cube Exp $
+
+# Legacy options
+.if !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	pgsql
+.endif
+.if !empty(PURE_FTPD_USE_TLS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	ssl
+.endif
+.if !empty(PURE_FTPD_USE_VIRTUAL_CHROOT:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	virtualchroot
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pureftpd
+PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql ssl virtualchroot
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+.  include "../../databases/mysql-client/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pgsql
+BUILD_DEFS+=		PURE_FTPD_USE_PGSQL
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-tls
+BUILD_DEFS+=		PURE_FTPD_USE_TLS
+.endif
+
+.if !empty(PKG_OPTIONS:Mvirtualchroot)
+CONFIGURE_ARGS+=	--with-virtualchroot
+BUILD_DEFS+=		PURE_FTPD_USE_VIRTUAL_CHROOT
+.endif