diff options
| author | antoine <antoine@FreeBSD.org> | 2014-09-07 07:17:30 +0000 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-09-07 07:17:30 +0000 |
| commit | 22d78b69eb75b55f57ae2c649ba67b570d44e7c2 (patch) | |
| tree | 8e428f5be13e92dd7433831aefa9dfc6c5267bd1 | |
| parent | 825abb8ee7c455975a0a49ba597b68e84cd13ad8 (diff) | |
| download | FreeBSD-ports-22d78b69eb75b55f57ae2c649ba67b570d44e7c2.zip FreeBSD-ports-22d78b69eb75b55f57ae2c649ba67b570d44e7c2.tar.gz | |
Remove optional dependency on BROKEN and unstaged databases/msql
| -rw-r--r-- | databases/sqlrelay/Makefile | 10 | ||||
| -rw-r--r-- | databases/sqlrelay/pkg-plist | 1 | ||||
| -rw-r--r-- | www/mnogosearch/Makefile | 7 | ||||
| -rw-r--r-- | www/udmsearch/Makefile | 4 |
4 files changed, 4 insertions, 18 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index c8fdcbf..c704594 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -21,6 +21,7 @@ CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ + --disable-msql \ --disable-perl \ --disable-php \ --disable-python \ @@ -33,7 +34,7 @@ PORTDOCS= * .include "${.CURDIR}/Makefile.common" -OPTIONS_DEFINE= MSQL MYSQL ODBC ORACLE PGSQL SQLITE3 FREETDS FIREBIRD DOCS +OPTIONS_DEFINE= MYSQL ODBC ORACLE PGSQL SQLITE3 FREETDS FIREBIRD DOCS OPTIONS_SUB= yes ORACLE_CONFIGURE_ENABLE= oracle @@ -64,13 +65,6 @@ CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" CONFIGURE_ARGS+= --disable-firebird .endif -.if ${PORT_OPTIONS:MMSQL} -LIB_DEPENDS+= libmsql.so:${PORTSDIR}/databases/msql -CONFIGURE_ARGS+= --with-msql-prefix="${LOCALBASE}" -.else -CONFIGURE_ARGS+= --disable-msql -.endif - .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index 204c0cf..1e8da47 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -68,7 +68,6 @@ libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so -%%MSQL%%libexec/sqlrelay/sqlrconnection_msql.so %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 5cef3ff..82b9bc8 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -19,7 +19,7 @@ CONFLICTS= dpsearch-[0-9]* udmsearch-[0-9]* mguesser-[0-9]* OPTIONS_DEFINE= DOCS EXAMPLES THREADS SSL ASIAN SYSLOG OPTIONS_MULTI= database -OPTIONS_MULTI_database= PGSQL MSQL MYSQL SQLITE2 SQLITE3 +OPTIONS_MULTI_database= PGSQL MYSQL SQLITE2 SQLITE3 OPTIONS_DEFAULT= THREADS SSL SYSLOG SQLITE3 @@ -65,11 +65,6 @@ CONFIGURE_ARGS+= --with-extra-charsets=all CONFIGURE_ARGS+= --disable-syslog .endif -.if ${PORT_OPTIONS:MMSQL} -LIB_DEPENDS+= libmsql.so:${PORTSDIR}/databases/msql -CONFIGURE_ARGS+= --with-msql=${LOCALBASE} -.endif - .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile index 0ae5e10..d314e81 100644 --- a/www/udmsearch/Makefile +++ b/www/udmsearch/Makefile @@ -20,11 +20,9 @@ CONFIGURE_ARGS= --enable-charset-guesser \ --localstatedir=/var/udmsearch USES= libtool -OPTIONS_DEFINE= MSQL MYSQL PGSQL DOCS +OPTIONS_DEFINE= MYSQL PGSQL DOCS OPTIONS_DEFAULT= MYSQL -MSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmsql.a:${PORTSDIR}/databases/msql -MSQL_CONFIGURE_ON+= --with-msql=${LOCALBASE} MYSQL_USE= MYSQL=YES MYSQL_CONFIGURE_ON+= --with-mysql=${LOCALBASE} PGSQL_USE= PGSQL=YES |
