aboutsummaryrefslogtreecommitdiff
path: root/dns
diff options
context:
space:
mode:
authorOliver Eikemeier <eik@FreeBSD.org>2004-05-01 12:08:05 +0000
committerOliver Eikemeier <eik@FreeBSD.org>2004-05-01 12:08:05 +0000
commit9a5050788269c497f197bc99bbc576027ef0d087 (patch)
treeea03ab6649b6e55049ad095a0c18aa181ad2ec51 /dns
parentf417eb249888cb2a43e1f2b5d5d0786cac0f4968 (diff)
downloadports-9a5050788269c497f197bc99bbc576027ef0d087.tar.gz
ports-9a5050788269c497f197bc99bbc576027ef0d087.zip
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)
Notes
Notes: svn path=/head/; revision=108087
Diffstat (limited to 'dns')
-rw-r--r--dns/powerdns-devel/Makefile11
-rw-r--r--dns/powerdns-devel/files/configure.powerdns10
-rw-r--r--dns/powerdns/Makefile11
-rw-r--r--dns/powerdns/files/configure.powerdns10
4 files changed, 16 insertions, 26 deletions
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index bbdeb242eb90..e85395bf2cfd 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -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=""
diff --git a/dns/powerdns-devel/files/configure.powerdns b/dns/powerdns-devel/files/configure.powerdns
index 349dcb7db993..add922f57538 100644
--- a/dns/powerdns-devel/files/configure.powerdns
+++ b/dns/powerdns-devel/files/configure.powerdns
@@ -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
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index bbdeb242eb90..e85395bf2cfd 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -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=""
diff --git a/dns/powerdns/files/configure.powerdns b/dns/powerdns/files/configure.powerdns
index 349dcb7db993..add922f57538 100644
--- a/dns/powerdns/files/configure.powerdns
+++ b/dns/powerdns/files/configure.powerdns
@@ -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