svn commit: r367490 - in head: databases/sqlrelay www/mnogosearch www/udmsearch

[Antoine Brodin]

Author: antoine
Date: Sun Sep  7 07:17:30 2014
New Revision: 367490
URL: http://svnweb.freebsd.org/changeset/ports/367490
QAT: https://qat.redports.org/buildarchive/r367490/

Log:
  Remove optional dependency on BROKEN and unstaged databases/msql

Modified:
  head/databases/sqlrelay/Makefile
  head/databases/sqlrelay/pkg-plist
  head/www/mnogosearch/Makefile
  head/www/udmsearch/Makefile

Modified: head/databases/sqlrelay/Makefile
==============================================================================
--- head/databases/sqlrelay/Makefile	Sun Sep  7 07:00:41 2014	(r367489)
+++ head/databases/sqlrelay/Makefile	Sun Sep  7 07:17:30 2014	(r367490)
@@ -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=
 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}"

Modified: head/databases/sqlrelay/pkg-plist
==============================================================================
--- head/databases/sqlrelay/pkg-plist	Sun Sep  7 07:00:41 2014	(r367489)
+++ head/databases/sqlrelay/pkg-plist	Sun Sep  7 07:17:30 2014	(r367490)
@@ -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

Modified: head/www/mnogosearch/Makefile
==============================================================================
--- head/www/mnogosearch/Makefile	Sun Sep  7 07:00:41 2014	(r367489)
+++ head/www/mnogosearch/Makefile	Sun Sep  7 07:17:30 2014	(r367490)
@@ -19,7 +19,7 @@ CONFLICTS=	dpsearch-[0-9]* udmsearch-[0-
 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=a
 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}

Modified: head/www/udmsearch/Makefile
==============================================================================
--- head/www/udmsearch/Makefile	Sun Sep  7 07:00:41 2014	(r367489)
+++ head/www/udmsearch/Makefile	Sun Sep  7 07:17:30 2014	(r367490)
@@ -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