ports/56026: [update ports]: Use USE_MYSQL and USE_OPENLDAP in my ports

[Clement Laforet]

>Number:         56026
>Category:       ports
>Synopsis:       [update ports]: Use USE_MYSQL and USE_OPENLDAP in my ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 27 03:00:37 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_MYSQL and USE_OPENLDAP in my ports.
	www/mod_accounting [1]
	mail/perdition [2]
	security/prelude-manager [3]	
>How-To-Repeat:
	N/A.
>Fix:

	

[1]
--- mod_accounting.diff begins here ---
Index: Makefile
===================================================================
RCS file: /WORK/ports/REPO/ports/www/mod_accounting/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	5 Aug 2003 05:30:14 -0000	1.5
+++ Makefile	27 Aug 2003 08:35:57 -0000
@@ -20,25 +20,6 @@
 MAKE_ARGS+=	APXS="${APXS}"
 APXS?=		${LOCALBASE}/sbin/apxs
 
-# MySQL deps hack
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-
-.include <bsd.port.pre.mk>
-
-.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
-
 .if defined(WITHOUT_PGSQL)
 MAKE_ARGS+=	WITHOUT_PGSQL=YES
 .else
@@ -48,19 +29,13 @@
 .if defined(WITHOUT_MYSQL)
 MAKE_ARGS+=	WITHOUT_MYSQL=YES
 .else
-LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
+USE_MYSQL=	YES
 .endif
 
 DOCS=		README FAQ.txt LICENSE
 
 pre-everything::
 	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_MYSQL_VER=323   Enable MySQL 3.23 support (default)"
-	@${ECHO} "      WITH_MYSQL_VER=40    Enable MySQL 4.0 support"
-	@${ECHO} "      WITH_MYSQL_VER=41    Enable MySQL 4.1 support"
-	@${ECHO} ""
 	@${ECHO} "      WITHOUT_MYSQL        Disable MySQL support"
 	@${ECHO} "      WITHOUT_PGSQL        Disable PostgreSQL support"
 	@${ECHO} ""
@@ -76,4 +51,4 @@
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- mod_accounting.diff ends here ---


[2]
--- perdition.diff begins here ---
Index: Makefile
===================================================================
RCS file: /WORK/ports/REPO/ports/mail/perdition/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	26 Aug 2003 20:25:48 -0000	1.17
+++ Makefile	27 Aug 2003 08:31:25 -0000
@@ -42,35 +42,10 @@
 # WITH_NIS: Enable NIS database backend
 # WITH_GDBM: Enable gdbm database backend
 # WITH_MYSQL: Enable MySQL database backend
-# WITH_MYSQL_VER:
-#		- 323 use MySQL 3.23.x
-#		- 40 use MySQL 4.0.x
-#		- 41 use MySQL 4.1.x
 # WITH_PGSQL: Enable PostgreSQL database backend
 # WITH_OPENLDAP: Enable OpenLDAP database backend
 # WITH_ODBC: Enable ODBC database backend
 
-LDAP_VER?=	21
-
-# MySQL deps hack (revision 2)
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-
-.include <bsd.port.pre.mk>
-
-.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=	40
-.endif
-
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--enable-ssl
 USE_OPENSSL=		yes
@@ -115,8 +90,8 @@
 .endif
 
 .if defined(WITH_MYSQL)
+USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--enable-mysql
-LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 PLIST_SUB+=		MYSQL=""
 MAN8+=			perditiondb_mysql_makedb.8
 .else
@@ -135,8 +110,8 @@
 .endif
 
 .if defined(WITH_OPENLDAP)
+USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--enable-ldap --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
 PLIST_SUB+=		OPENLDAP=""
 MAN8+=			perditiondb_ldap_makedb.8
 .else
@@ -164,4 +139,4 @@
 	@${ECHO_MSG} "/********************************************************/"
 	@${ECHO_MSG} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- perdition.diff ends here ---

[3]
--- prelude-manager.diff begins here ---
Index: Makefile
===================================================================
RCS file: /WORK/ports/REPO/ports/security/prelude-manager/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	30 Jul 2003 11:35:41 -0000	1.2
+++ Makefile	27 Aug 2003 08:52:27 -0000
@@ -21,25 +21,6 @@
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix="" --localstatedir=/var
 
-# MySQL deps hack
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-
-.include <bsd.port.pre.mk>
-
-.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=	40
-.endif
-
 .if defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--disable-openssl
 .else
@@ -48,7 +29,7 @@
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
+USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=		MYSQL=""
 .else
@@ -72,11 +53,8 @@
 	@${ECHO} ""
 	@${ECHO} "      WITHOUT_SSL=yes         Disable SSL support"
 	@${ECHO} "      WITH_MYSQL=yes          Enable MySQL support"
-	@${ECHO} "             - WITH_MYSQL_VER=323   Enable MySQL 3.23 support"
-	@${ECHO} "             - WITH_MYSQL_VER=40    Enable MySQL 4.0 support (default)"
-	@${ECHO} "             - WITH_MYSQL_VER=41    Enable MySQL 4.1 support"
 	@${ECHO} "      WITH_POSTGRES=yes       Enable PostreSQL support"
 	@${ECHO} "*---------------------------------------------------------------------------*"
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- prelude-manager.diff ends here ---


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