diff options
| -rw-r--r-- | mail/perdition/Makefile | 31 | ||||
| -rw-r--r-- | security/prelude-manager/Makefile | 26 | ||||
| -rw-r--r-- | www/mod_accounting/Makefile | 29 |
3 files changed, 7 insertions, 79 deletions
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index 3d559325cd3e..a63228117539 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -42,35 +42,10 @@ INSTALLS_SHLIB= yes # 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 @@ PLIST_SUB+= GDBM="@comment " .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 @@ PLIST_SUB+= PGSQL="@comment " .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 @@ post-install: @${ECHO_MSG} "/********************************************************/" @${ECHO_MSG} "" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 4145846bf201..f1cd63d67f11 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -21,25 +21,6 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ARGS+= --enable-openssl .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 @@ post-patch: @${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> diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile index 785dd695524b..8c934dc35938 100644 --- a/www/mod_accounting/Makefile +++ b/www/mod_accounting/Makefile @@ -20,25 +20,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 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 @@ LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 .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 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> |