diff options
author | dinoex <dinoex@FreeBSD.org> | 2003-10-25 20:45:03 +0000 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2003-10-25 20:45:03 +0000 |
commit | 09eed02d690f24db27ee1d180c1f0152d21e4339 (patch) | |
tree | 9db5c942ae3d28d5e4e9e0142f000300612c9bc5 /dns | |
parent | 18583a024fd4220c6b2d839589db46bc1fdd4653 (diff) | |
download | FreeBSD-ports-09eed02d690f24db27ee1d180c1f0152d21e4339.zip FreeBSD-ports-09eed02d690f24db27ee1d180c1f0152d21e4339.tar.gz |
- let user configure witch MySQL or OpenLDAP versions he wants
Diffstat (limited to 'dns')
-rw-r--r-- | dns/powerdns-devel/Makefile | 5 | ||||
-rw-r--r-- | dns/powerdns-devel/files/configure.powerdns | 32 | ||||
-rw-r--r-- | dns/powerdns/Makefile | 5 | ||||
-rw-r--r-- | dns/powerdns/files/configure.powerdns | 32 |
4 files changed, 60 insertions, 14 deletions
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 9618e1e..564e7bc 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -21,7 +21,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \ --with-dynmodules="" # --enable-debug -LDAP_PORT?= net/openldap20-client # use user config if possible .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) @@ -44,7 +43,8 @@ CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +MYSQL_PORT?= databases/mysql323-client +LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${MYSQL_PORT} CONFIGURE_ARGS+= --enable-mysql CONFIGURE_MODULES+= "gmysql" .else @@ -85,6 +85,7 @@ PLIST_SUB+= RECURSOR="@comment " .if defined(WITH_LDAP) USE_GCC=3.2 +LDAP_PORT?= net/openldap20-client LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT} LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT} CONFIGURE_MODULES+= "ldap" diff --git a/dns/powerdns-devel/files/configure.powerdns b/dns/powerdns-devel/files/configure.powerdns index 02545a4..d309255 100644 --- a/dns/powerdns-devel/files/configure.powerdns +++ b/dns/powerdns-devel/files/configure.powerdns @@ -11,10 +11,14 @@ if [ "${POWERDNS_OPTIONS}" ]; then else dialog --title "configuration options" --clear \ --checklist "\n\ -Please select desired options:" -1 -1 3 \ +Please select desired options:" -1 -1 7 \ PostgreSQL "PostgreSQL driver" ON \ -MySQL "MySQL driver" OFF \ -OpenLDAP "OpenLDAP backend" OFF \ +MySQL323 "MySQL 3.23 driver" OFF \ +MySQL40 "MySQL 4.0 driver" OFF \ +MySQL41 "MySQL 4.1 driver" OFF \ +OpenLDAP20 "OpenLDAP 2.0 backend" OFF \ +OpenLDAP21 "OpenLDAP 2.1 backend" OFF \ +OpenLDAP22 "OpenLDAP 2.2 backend" OFF \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -42,11 +46,29 @@ while [ "$1" ]; do \"PostgreSQL\") echo WITH_POSTGRESQL_DRIVER=YES ;; - \"MySQL\") + \"MySQL323\") echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql323-client ;; - \"OpenLDAP\") + \"MySQL40\") + echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql40-client + ;; + \"MySQL41\") + echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql41-client + ;; + \"OpenLDAP20\") + echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap20-client + ;; + \"OpenLDAP21\") + echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap21-client + ;; + \"OpenLDAP22\") echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap22-client ;; \"nothing\"|true) ;; diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 9618e1e..564e7bc 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -21,7 +21,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \ --with-dynmodules="" # --enable-debug -LDAP_PORT?= net/openldap20-client # use user config if possible .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) @@ -44,7 +43,8 @@ CONFIGURE_ARGS+= --disable-pgsql .endif .if defined(WITH_MYSQL_DRIVER) -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +MYSQL_PORT?= databases/mysql323-client +LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${MYSQL_PORT} CONFIGURE_ARGS+= --enable-mysql CONFIGURE_MODULES+= "gmysql" .else @@ -85,6 +85,7 @@ PLIST_SUB+= RECURSOR="@comment " .if defined(WITH_LDAP) USE_GCC=3.2 +LDAP_PORT?= net/openldap20-client LIB_DEPENDS+= ldap.2:${PORTSDIR}/${LDAP_PORT} LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT} CONFIGURE_MODULES+= "ldap" diff --git a/dns/powerdns/files/configure.powerdns b/dns/powerdns/files/configure.powerdns index 02545a4..d309255 100644 --- a/dns/powerdns/files/configure.powerdns +++ b/dns/powerdns/files/configure.powerdns @@ -11,10 +11,14 @@ if [ "${POWERDNS_OPTIONS}" ]; then else dialog --title "configuration options" --clear \ --checklist "\n\ -Please select desired options:" -1 -1 3 \ +Please select desired options:" -1 -1 7 \ PostgreSQL "PostgreSQL driver" ON \ -MySQL "MySQL driver" OFF \ -OpenLDAP "OpenLDAP backend" OFF \ +MySQL323 "MySQL 3.23 driver" OFF \ +MySQL40 "MySQL 4.0 driver" OFF \ +MySQL41 "MySQL 4.1 driver" OFF \ +OpenLDAP20 "OpenLDAP 2.0 backend" OFF \ +OpenLDAP21 "OpenLDAP 2.1 backend" OFF \ +OpenLDAP22 "OpenLDAP 2.2 backend" OFF \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -42,11 +46,29 @@ while [ "$1" ]; do \"PostgreSQL\") echo WITH_POSTGRESQL_DRIVER=YES ;; - \"MySQL\") + \"MySQL323\") echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql323-client ;; - \"OpenLDAP\") + \"MySQL40\") + echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql40-client + ;; + \"MySQL41\") + echo WITH_MYSQL_DRIVER=YES + echo MYSQL_PORT?=databases/mysql41-client + ;; + \"OpenLDAP20\") + echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap20-client + ;; + \"OpenLDAP21\") + echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap21-client + ;; + \"OpenLDAP22\") echo WITH_LDAP=YES + echo LDAP_PORT?=net/openldap22-client ;; \"nothing\"|true) ;; |