1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Fixed OpenLDAP 2.2 support by using USE_OPENLDAP knob

Default MySQL version now 4.0 instead of 3.23
pet portlint

PR:		66143
Submitted by:	Ralf van der Enden <tremere@cainites.net> (maintainer)
This commit is contained in:
Oliver Eikemeier 2004-05-01 12:08:05 +00:00
parent f417eb2498
commit 9a50507882
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=108087
4 changed files with 16 additions and 26 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= powerdns
PORTVERSION= 2.9.16
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@ -52,8 +52,7 @@ CONFIGURE_ARGS+= --disable-pgsql
.endif
.if defined(WITH_MYSQL_DRIVER)
LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${MYSQL_PORT}
MYSQL_PORT?= databases/mysql323-client
USE_MYSQL?= YES
CONFIGURE_ARGS+= --enable-mysql
CONFIGURE_MODULES+= "gmysql"
.else
@ -61,11 +60,9 @@ CONFIGURE_ARGS+= --disable-mysql
.endif
.if defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
LDAP_PORT?= net/openldap21-client
USE_OPENLDAP?= YES
USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= YES
INSTALLS_SHLIB= YES
USE_GCC=3.2
CONFIGURE_MODULES+= "ldap"
PLIST_SUB+= WITHLDAP=""

View File

@ -11,7 +11,7 @@ if [ "${POWERDNS_OPTIONS}" ]; then
else
dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 9 \
Please select desired options:" -1 -1 8 \
PostgreSQL "PostgreSQL driver" ON \
MySQL323 "MySQL 3.23 driver" OFF \
MySQL40 "MySQL 4.0 driver" OFF \
@ -49,23 +49,21 @@ while [ "$1" ]; do
;;
\"MySQL323\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql323-client
echo WITH_MYSQL_VER?=323
;;
\"MySQL40\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql40-client
;;
\"MySQL41\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql41-client
echo WITH_MYSQL_VER?=41
;;
\"OpenLDAP21\")
echo WITH_LDAP=YES
echo LDAP_PORT?=net/openldap21-client
;;
\"OpenLDAP22\")
echo WITH_LDAP=YES
echo LDAP_PORT?=net/openldap22-client
echo WANT_OPENLDAP_VER?=22
;;
\"SQLite\")
echo WITH_SQLITE=YES

View File

@ -7,7 +7,7 @@
PORTNAME= powerdns
PORTVERSION= 2.9.16
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@ -52,8 +52,7 @@ CONFIGURE_ARGS+= --disable-pgsql
.endif
.if defined(WITH_MYSQL_DRIVER)
LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${MYSQL_PORT}
MYSQL_PORT?= databases/mysql323-client
USE_MYSQL?= YES
CONFIGURE_ARGS+= --enable-mysql
CONFIGURE_MODULES+= "gmysql"
.else
@ -61,11 +60,9 @@ CONFIGURE_ARGS+= --disable-mysql
.endif
.if defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT}
LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT}
LDAP_PORT?= net/openldap21-client
USE_OPENLDAP?= YES
USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= YES
INSTALLS_SHLIB= YES
USE_GCC=3.2
CONFIGURE_MODULES+= "ldap"
PLIST_SUB+= WITHLDAP=""

View File

@ -11,7 +11,7 @@ if [ "${POWERDNS_OPTIONS}" ]; then
else
dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 9 \
Please select desired options:" -1 -1 8 \
PostgreSQL "PostgreSQL driver" ON \
MySQL323 "MySQL 3.23 driver" OFF \
MySQL40 "MySQL 4.0 driver" OFF \
@ -49,23 +49,21 @@ while [ "$1" ]; do
;;
\"MySQL323\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql323-client
echo WITH_MYSQL_VER?=323
;;
\"MySQL40\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql40-client
;;
\"MySQL41\")
echo WITH_MYSQL_DRIVER=YES
echo MYSQL_PORT?=databases/mysql41-client
echo WITH_MYSQL_VER?=41
;;
\"OpenLDAP21\")
echo WITH_LDAP=YES
echo LDAP_PORT?=net/openldap21-client
;;
\"OpenLDAP22\")
echo WITH_LDAP=YES
echo LDAP_PORT?=net/openldap22-client
echo WANT_OPENLDAP_VER?=22
;;
\"SQLite\")
echo WITH_SQLITE=YES