From owner-svn-ports-head@FreeBSD.ORG Sun Sep 7 07:17:31 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1E9D7CB; Sun, 7 Sep 2014 07:17:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9D3471C1D; Sun, 7 Sep 2014 07:17:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s877HVw3008198; Sun, 7 Sep 2014 07:17:31 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s877HUTX008194; Sun, 7 Sep 2014 07:17:30 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409070717.s877HUTX008194@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 7 Sep 2014 07:17:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367490 - in head: databases/sqlrelay www/mnogosearch www/udmsearch X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2014 07:17:31 -0000 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