10 files changed, 17 insertions, 41 deletions

diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index aeb1d2a5ab60..31276fd7dfad 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmemcached
 PORTVERSION=	1.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
@@ -10,9 +10,9 @@ MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	C and C++ client library to the memcached server
 
 LIB_DEPENDS?=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2
 
-USES=		gmake pathfix pkgconfig perl5 libtool:keepla
+USES=		gmake pathfix pkgconfig perl5 libtool
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 42820c9fd28b..d50ea682db49 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -98,22 +98,18 @@ include/libmemcachedutil-1.0/pool.h
 include/libmemcachedutil-1.0/util.h
 include/libmemcachedutil-1.0/version.h
 lib/libhashkit.a
-lib/libhashkit.la
 lib/libhashkit.so
 lib/libhashkit.so.2
 lib/libhashkit.so.2.0.0
 lib/libmemcached.a
-lib/libmemcached.la
 lib/libmemcached.so
 lib/libmemcached.so.10
 lib/libmemcached.so.10.0.0
 lib/libmemcachedprotocol.a
-lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so
 lib/libmemcachedprotocol.so.0
 lib/libmemcachedprotocol.so.0.0.0
 lib/libmemcachedutil.a
-lib/libmemcachedutil.la
 lib/libmemcachedutil.so
 lib/libmemcachedutil.so.2
 lib/libmemcachedutil.so.2.0.0
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 9e5011e6e017..86fee7ca2285 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mariadb
 PORTVERSION=	5.3.12
-PORTREVISION=	3
+PORTREVISION=	4
 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,7 +48,7 @@ OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
 
 
 .if !defined(MARIADB_CLIENT_SLAVE)
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 MANS=	innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 	myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index f0ffc1802bbe..86ffccab853b 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	memcached
 PORTVERSION=	1.4.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -15,7 +15,7 @@ COMMENT=	High-performance distributed memory object cache system
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 CONFLICTS=	memcached-1.2*
 
@@ -34,11 +34,10 @@ SHEBANG_FILES=	scripts/memcached-tool
 
 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libevent=${LOCALBASE}/lib/event2 --program-prefix= \
+CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix= \
 		--disable-coverage
 
 CFLAGS+=	-fstack-protector \
-		-I${LOCALBASE}/include/event2/compat \
 		-I${LOCALBASE}/include
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
@@ -63,9 +62,6 @@ BROKEN=			DTRACE broken with gcc/clang - reported upstream
 BUILD_DEPENDS=	xml2rfc:${PORTSDIR}/textproc/xml2rfc
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,-levent,-levent-2.0,g" ${WRKSRC}/configure
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile
index fa167a427bfb..b2551db49753 100644
--- a/databases/memcachedb/Makefile
+++ b/databases/memcachedb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	memcachedb
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -12,7 +12,7 @@ COMMENT=	Distributed storage system designed for persistence
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
 CONFIGURE_ARGS=	--enable-threads --with-bdb="${LOCALBASE}" \
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index c673033692f2..caea80a3fd27 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple queue service over Memcache
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 USE_CSTD=	gnu89
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index 6c915b2c4f19..d09cf6315396 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysql-proxy
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-Proxy
@@ -12,7 +13,7 @@ COMMENT=	Monitor, analyze, or transform the communication of MySQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libglib-2.0.so:${PORTSDIR}/devel/glib20
 
 CONFIGURE_ARGS+=	--with-lua=lua-${LUA_VER} --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 69644f23a1a1..0a68f2ffe449 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgbouncer
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3393/
 
@@ -12,7 +12,7 @@ COMMENT=	Lightweight connection pooler for PostgreSQL
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/pgbouncer/files/patch-configure b/databases/pgbouncer/files/patch-configure
deleted file mode 100644
index ba1498148ea5..000000000000
--- a/databases/pgbouncer/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	2012-11-28 17:11:13.000000000 +0400
-+++ configure	2013-09-25 23:54:23.465994180 +0400
-@@ -6332,8 +6332,8 @@
-       levent=yes
-     else
-       levent=yes
--      CPPFLAGS="$CPPFLAGS -I$withval/include"
--      LDFLAGS="$LDFLAGS -L$withval/lib"
-+      CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/include/event2/compat"
-+      LDFLAGS="$LDFLAGS -L$withval/lib/event2"
-     fi
- 
- fi
-
diff --git a/databases/sharedance/Makefile b/databases/sharedance/Makefile
index 5e6564abc81f..bd2def123eb6 100644
--- a/databases/sharedance/Makefile
+++ b/databases/sharedance/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	sharedance
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://download.pureftpd.org/pub/sharedance/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to centralize keys and associated data
 
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 CONFIGURE_ARGS=	--with-largefile
 GNU_CONFIGURE=	yes
@@ -19,9 +19,6 @@ CFLAGS+=	-I${LOCALBASE}/include/event2/compat \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/event2
 
-post-patch:
-	@${REINPLACE_CMD} -e "s/-levent/-levent-2.0/g" ${WRKSRC}/configure
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/php/*.php ${STAGEDIR}${DATADIR}