From 3e3473b2cb0c63855403ad3c89d21fa109e9a38a Mon Sep 17 00:00:00 2001
From: roam <roam@FreeBSD.org>
Date: Thu, 23 Aug 2001 17:18:23 +0000
Subject: Update to 0.99.1b. Make the --with-pam configure arg conditional:
 only compile with PAM support if neither WITH_LDAP nor WITH_MYSQL is
 specified.

PR:		29995
Submitted by:	author/maintainer
---
 ftp/pure-ftpd/Makefile  | 32 +++++++++++++++++++++++++-------
 ftp/pure-ftpd/distinfo  |  2 +-
 ftp/pure-ftpd/pkg-plist |  1 +
 3 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'ftp')

diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index aa65df771842..95637f085094 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	0.99.1
+PORTVERSION=	0.99.1b
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pureftpd
@@ -27,18 +27,35 @@ LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
 
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-pam --with-everything --with-paranoidmsg
+CONFIGURE_ARGS+=	--with-everything --with-paranoidmsg
 # language support requested?
 .if defined(WITH_LANG)
 CONFIGURE_ARGS+=	--with-language="${WITH_LANG}"
 .endif
+
+# ldap support requested ?
+.if defined(WITH_LDAP)
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
+# mysql support requested ?
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+=	--with-mysql
+.endif
+
+# if mysql or ldap are disabled, enable pam
+.if !defined(WITH_LDAP) && !defined(WITH_MYSQL)
+CONFIGURE_ARGS+=	--with-pam
+.endif
+
 # use of dmalloc requested?
 .if defined(WITH_DMALLOC)
 CONFIGURE_ARGS+=	--with-dmalloc
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .endif
 
-MAN8=		pure-ftpd.8 pure-ftpwho.8 pure-mrtginfo.8 pure-uploadscript.8
+MAN8=		pure-ftpd.8 pure-ftpwho.8 pure-mrtginfo.8 pure-statsdecode.8 \
+		pure-uploadscript.8
 
 .include <bsd.port.pre.mk>
 
@@ -63,11 +80,12 @@ CONTRIB=	xml_python_processors.txt
 
 pre-fetch:
 	@${ECHO} "You can use the following additional options:"
-	@${ECHO} "WITH_DMALLOC=1	- enable use of the dmalloc library;"
-	@${ECHO} "WITH_LDAP=1		- Store users in LDAP directories;"	
-	@${ECHO} "WITH_MYSQL=1		- Store users in MySQL databases;"		
-	@${ECHO} "WITH_LANG=lang	- enable compilation of language support, lang is one of"
+	@${ECHO} "WITH_DMALLOC=1        - enable use of the dmalloc library;"
+	@${ECHO} "WITH_LDAP=1           - Store users in LDAP directories;"	
+	@${ECHO} "WITH_MYSQL=1          - Store users in MySQL databases;"		
+	@${ECHO} "WITH_LANG=lang        - enable compilation of language support, lang is one of"
 	@${ECHO} "  english, german, romanian, french, polish, spanish or danish."
+	@${ECHO}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-ldap.conf ${PREFIX}/etc/pureftpd-ldap.conf.sample
diff --git a/ftp/pure-ftpd/distinfo b/ftp/pure-ftpd/distinfo
index 7deecb7d0f43..db9e922355b1 100644
--- a/ftp/pure-ftpd/distinfo
+++ b/ftp/pure-ftpd/distinfo
@@ -1 +1 @@
-MD5 (pure-ftpd-0.99.1.tar.gz) = f94f6523c9fbec1a2ec98d4bb40b023f
+MD5 (pure-ftpd-0.99.1b.tar.gz) = dfd34d5347c403108de296ea8e4a5858
diff --git a/ftp/pure-ftpd/pkg-plist b/ftp/pure-ftpd/pkg-plist
index 3604b4795a85..6b83636b84e0 100644
--- a/ftp/pure-ftpd/pkg-plist
+++ b/ftp/pure-ftpd/pkg-plist
@@ -2,6 +2,7 @@ sbin/pure-mrtginfo
 sbin/pure-ftpd
 sbin/pure-ftpwho
 sbin/pure-uploadscript
+sbin/pure-statsdecode
 sbin/pure-config.pl
 etc/pureftpd-ldap.conf.sample
 etc/pureftpd-mysql.conf.sample
-- 
cgit