ports/56247: [patch] ftp/pureftpd: Utilize USE_MYSQL and USE_OPENLDAP

[Clement Laforet]

>Number:         56247
>Category:       ports
>Synopsis:       [patch] ftp/pureftpd: Utilize USE_MYSQL and USE_OPENLDAP
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 31 12:40:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org  5.1-CURRENT FreeBSD 5.1-CURRENT#0: Sun Aug 24 15:37:26 CEST 2003 root at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	Make pureftpd port utilize USE_MYSQL and USE_OPENLDAP macro.
	Frank Denis is Cc'ed for notification and/or approval.

>How-To-Repeat:
	N/A.
>Fix:

	

--- Makefile-pureftpd.diff begins here ---
--- Makefile.orig	Sun Aug 31 19:20:58 2003
+++ Makefile	Sun Aug 31 19:30:55 2003
@@ -23,20 +23,13 @@
 MAINTAINER=	j at pureftpd.org
 COMMENT=	A small, easy to set up, fast and very secure FTP server
 
-.if defined(WITH_LDAP) && !defined(WITH_LDAP21)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap20-client
-.elif defined(WITH_LDAP21) && !defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
-.elif defined(WITH_LDAP21) && defined(WITH_LDAP)
-BROKEN=		"You may only specify WITH_LDAP xor WITH_LDAP21, but not both together"
+.if defined(WITH_LDAP)
+USE_OPENLDAP=		YES
 .endif
 
-.if defined(WITH_MYSQL) && !defined(WITH_MYSQL4)
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
-.elif defined(WITH_MYSQL4) && !defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.elif defined(WITH_MYSQL4) && defined(WITH_MYSQL)
-BROKEN=		"You may only specify WITH_MYSQL xor WITH_MYSQL4, but not both together"
+.if defined(WITH_MYSQL)
+USE_MYSQL=		YES
+BROKEN_WITH_MYSQL=	41
 .endif
 
 .if defined(WITH_PGSQL)
@@ -57,16 +50,16 @@
 .endif
 
 # ldap support requested?
-.if defined(WITH_LDAP) || defined(WITH_LDAP21)
+.if defined(WITH_LDAP)
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
 # mysql support requested?
-.if defined(WITH_MYSQL) || defined(WITH_MYSQL4)
+.if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql
 .endif
 
-# mysql support requested?
+# postgresql support requested?
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
--- Makefile-pureftpd.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: