ports/56027: [orphaned port] mail/teapop: use USE_OPENLDAP and USE_MYSQL

[Clement Laforet]

>Number:         56027
>Category:       ports
>Synopsis:       [orphaned port] mail/teapop: use USE_OPENLDAP and USE_MYSQL
>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:   Wed Aug 27 03:00:38 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:
	Use new USE_OPENLDAP and USE_MYSQL in mail/teapop Makefile
>How-To-Repeat:
	
>Fix:

	

--- teapop.diff begins here ---
Index: Makefile
===================================================================
RCS file: /WORK/ports/REPO/ports/mail/teapop/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	21 Aug 2003 05:29:11 -0000	1.21
+++ Makefile	27 Aug 2003 09:52:01 -0000
@@ -55,48 +55,24 @@
 
 MAN8=		teapop.8
 
-.include <bsd.port.pre.mk>
-
 ## Authentication backend
-##   WITH_LDAP: add support for authentication through OpenLDAP server
-##   WITH_LDAP_VER: OpenLDAP version to use (can be: 20 for 2.0, 21 for 2.1, 22 for 2.2 ; default 21)
+##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_MYSQL_VER: MySQL version to use (can be: 323 for 3.23, 40 for 4.0, 4.1 for 4.1 ; default 323)
 ##   WITH_PGSQL: enable support for authentication from PostgreSQL database
 
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-WITH_LDAP_VER?=	21
-
-# MySQL deps hack (revision 2)
-.if defined(WITH_MYSQL_VER)
-MYSQL_VER=	${WITH_MYSQL_VER}
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER})
-MYSQL_VER=	323
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER})
-MYSQL_VER=	40
-.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER})
-MYSQL_VER=	41
-.else
-MYSQL_VER=	323
-.endif
-
-LDAP_VER=	${WITH_LDAP_VER}
-
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
+USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql
-LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-.if defined(WITH_LDAP)
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap=openldap
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
 .endif
 
 show-options:
@@ -110,4 +86,4 @@
 	@${ECHO} "------------------------------------------------------------------------"
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- teapop.diff ends here ---


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