From owner-svn-ports-head@FreeBSD.ORG Wed Mar 19 17:19:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D02B75D; Wed, 19 Mar 2014 17:19:35 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2044F253; Wed, 19 Mar 2014 17:19:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2JHJY6B043670; Wed, 19 Mar 2014 17:19:34 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2JHJYsf043669; Wed, 19 Mar 2014 17:19:34 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403191719.s2JHJYsf043669@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 19 Mar 2014 17:19:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348635 - head/databases/mariadb-server 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.17 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: Wed, 19 Mar 2014 17:19:35 -0000 Author: bapt Date: Wed Mar 19 17:19:34 2014 New Revision: 348635 URL: http://svnweb.freebsd.org/changeset/ports/348635 QAT: https://qat.redports.org/buildarchive/r348635/ Log: Revert switch to libevent-2.0 (configure fails to properly discover it and I don't have time to investigate) Submitted by: geoffroy desvernay (maintainer) Modified: head/databases/mariadb-server/Makefile Modified: head/databases/mariadb-server/Makefile ============================================================================== --- head/databases/mariadb-server/Makefile Wed Mar 19 17:19:34 2014 (r348634) +++ head/databases/mariadb-server/Makefile Wed Mar 19 17:19:34 2014 (r348635) @@ -2,7 +2,7 @@ PORTNAME= mariadb PORTVERSION= 5.3.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ @@ -48,11 +48,7 @@ OPENSSL_DESC= Use OpenSSL instead of bun .if !defined(MARIADB_CLIENT_SLAVE) -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} -LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 -CFLAGS+= -I${LOCALBASE}/include/event2/compat \ - -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/event2 +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent MANS= innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \ @@ -275,7 +271,6 @@ EXTRA_PATCHES+= ${FILESDIR}/scripts__Mak MDB_SERVER_SUBDIRS= include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files post-patch: - @${REINPLACE_CMD} -e "s|-levent|-levent-2.0|g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SERVER_SUBDIRS}|" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|^\(install:\).*|\1|" ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in