From owner-svn-ports-head@FreeBSD.ORG Thu Jul 24 13:33:09 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 5D80572A; Thu, 24 Jul 2014 13:33:09 +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 4785B20B1; Thu, 24 Jul 2014 13:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6ODX9E8045366; Thu, 24 Jul 2014 13:33:09 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6ODWxB4045245; Thu, 24 Jul 2014 13:32:59 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407241332.s6ODWxB4045245@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 24 Jul 2014 13:32:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362796 - in head: . Mk databases/libmemcached databases/mariadb-server databases/memcached databases/memcachedb databases/memcacheq databases/mysql-proxy databases/pgbouncer databases/... 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 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: Thu, 24 Jul 2014 13:33:09 -0000 Author: bapt Date: Thu Jul 24 13:32:58 2014 New Revision: 362796 URL: http://svnweb.freebsd.org/changeset/ports/362796 QAT: https://qat.redports.org/buildarchive/r362796/ Log: Only use libevent2 Remove libevent as libevent2 is providing a good compatibility interface as well as providing better performances. Remove custom patches from libevent2 and install libevent2 the regular way Mark ports abusing private fields of the libevent1 API as broken Import a patch from fedora to have honeyd working with libevent2 Remove most of the patches necessary to find the custom installation we used to have for libevent2 With hat: portmgr Added: head/net/honeyd/files/honeyd-1.5c-libevent2.patch (contents, props changed) head/security/fragroute/files/patch-fragroute.c (contents, props changed) head/www/mohawk/files/patch-Makefile.inc (contents, props changed) Deleted: head/databases/pgbouncer/files/patch-configure head/devel/libevent/ head/devel/libevent2/files/ head/net/netatalk3/files/patch-etc_netatalk_Makefile.in Modified: head/MOVED head/Mk/bsd.gecko.mk head/UPDATING head/databases/libmemcached/Makefile head/databases/libmemcached/pkg-plist head/databases/mariadb-server/Makefile head/databases/memcached/Makefile head/databases/memcachedb/Makefile head/databases/memcacheq/Makefile head/databases/mysql-proxy/Makefile head/databases/pgbouncer/Makefile head/databases/sharedance/Makefile head/devel/Makefile head/devel/eventxx/Makefile head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile head/devel/libdnsres/Makefile head/devel/libdnsres/pkg-plist head/devel/libevent2/Makefile head/devel/libevent2/pkg-plist head/devel/libmsocket/Makefile head/devel/ocaml-event/Makefile head/devel/p5-Event-Lib/Makefile head/devel/pecl-event/Makefile head/devel/pecl-libevent/Makefile head/devel/pinba_engine/Makefile head/devel/pinba_engine/pkg-plist head/devel/py-event/Makefile head/devel/thrift-cpp/Makefile head/devel/thrift/bsd.thrift.mk head/dns/adsuck/Makefile head/dns/dnsproxy/Makefile head/dns/getdns/Makefile head/dns/nsd/Makefile head/dns/unbound/Makefile head/lang/io/Makefile.addons head/mail/dbmail/Makefile head/mail/opensmtpd-devel/Makefile head/mail/opensmtpd/Makefile head/mail/rspamd/Makefile head/mail/thunderbird/Makefile head/net-p2p/transmission-cli/Makefile head/net-p2p/tribler/Makefile head/net-p2p/unworkable/Makefile head/net/aprsc/Makefile head/net/honeyd/Makefile head/net/ifstated/Makefile head/net/ladvd/Makefile head/net/netatalk3/Makefile head/net/ntop/Makefile head/net/ntp-devel/Makefile head/net/nylon/Makefile head/net/openospfd/Makefile head/net/relayd/Makefile head/net/scribe/Makefile head/net/spserver/Makefile head/net/trickle/Makefile head/net/turnserver/Makefile head/security/fragroute/Makefile head/security/scanssh/Makefile head/security/spybye/Makefile head/security/stegdetect/Makefile head/security/tor-devel/Makefile head/security/tor/Makefile head/sysutils/grok/Makefile head/sysutils/ori/Makefile head/sysutils/tmux/Makefile head/textproc/groonga/Makefile head/www/chromium/Makefile head/www/crawl/Makefile head/www/firefox-esr/Makefile head/www/firefox/Makefile head/www/httpsqs/Makefile head/www/mohawk/Makefile head/www/nghttp2/Makefile head/www/seamonkey/Makefile head/www/spdylay/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Jul 24 13:24:19 2014 (r362795) +++ head/MOVED Thu Jul 24 13:32:58 2014 (r362796) @@ -6312,3 +6312,4 @@ print/dvipsk-tetex|print/tex-dvipsk|2014 print/dvipdfmx|print/tex-dvipdfmx|2014-07-23|Use TeXLive version print/jadetex|print/tex-jadetex|2014-07-23|Use TeXLive version japanese/teTeX|print/texlive-full|2014-07-23|Use TeXLive +devel/libevent|devel/libevent2|2014-07-27|libevent2 replaced libevent Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Thu Jul 24 13:24:19 2014 (r362795) +++ head/Mk/bsd.gecko.mk Thu Jul 24 13:32:58 2014 (r362796) @@ -133,7 +133,7 @@ cairo_LIB_DEPENDS= libcairo.so:${PORTSDI cairo_MOZ_OPTIONS= --enable-system-cairo cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/cairo -event_LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +event_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Jul 24 13:24:19 2014 (r362795) +++ head/UPDATING Thu Jul 24 13:32:58 2014 (r362796) @@ -6,6 +6,12 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20140723: + AFFECTS: users of devel/libevent + + libevent1 as been replaced by libevent2 via the compatibility layer. + Make sure to remove libevent before upgrading the regular way. + +20140723: AFFECTS: users of security/scanlogd AUTHOR: tgyurci@gmail.com Modified: head/databases/libmemcached/Makefile ============================================================================== --- head/databases/libmemcached/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/libmemcached/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 Modified: head/databases/libmemcached/pkg-plist ============================================================================== --- head/databases/libmemcached/pkg-plist Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/libmemcached/pkg-plist Thu Jul 24 13:32:58 2014 (r362796) @@ -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 Modified: head/databases/mariadb-server/Makefile ============================================================================== --- head/databases/mariadb-server/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/mariadb-server/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 bun .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 \ Modified: head/databases/memcached/Makefile ============================================================================== --- head/databases/memcached/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/memcached/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 me 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 - 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} Modified: head/databases/memcachedb/Makefile ============================================================================== --- head/databases/memcachedb/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/memcachedb/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 desi 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}" \ Modified: head/databases/memcacheq/Makefile ============================================================================== --- head/databases/memcacheq/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/memcacheq/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -14,7 +14,7 @@ COMMENT= Simple queue service over Memca 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}" Modified: head/databases/mysql-proxy/Makefile ============================================================================== --- head/databases/mysql-proxy/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/mysql-proxy/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 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 Modified: head/databases/pgbouncer/Makefile ============================================================================== --- head/databases/pgbouncer/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/pgbouncer/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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 f LICENSE= BSD2CLAUSE -LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 OPTIONS_DEFINE= DOCS Modified: head/databases/sharedance/Makefile ============================================================================== --- head/databases/sharedance/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/databases/sharedance/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -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/c -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} Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -1000,7 +1000,6 @@ SUBDIR += libesedb SUBDIR += libestr SUBDIR += libev - SUBDIR += libevent SUBDIR += libevent-hiphop SUBDIR += libevent2 SUBDIR += libevt Modified: head/devel/eventxx/Makefile ============================================================================== --- head/devel/eventxx/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/eventxx/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= eventxx PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://proj.llucax.com.ar/home/eventxx/releases/ \ LOCAL/glarkin @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= gahr MAINTAINER= ports@FreeBSD.org COMMENT= C++ wrapper for libevent -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/gearmand-devel/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ @@ -13,7 +13,7 @@ COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent \ +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/gearmand/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ @@ -13,7 +13,7 @@ COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent \ +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo Modified: head/devel/libdnsres/Makefile ============================================================================== --- head/devel/libdnsres/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/libdnsres/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,16 +3,16 @@ PORTNAME= libdnsres PORTVERSION= 0.1a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= http://monkey.org/~provos/ MAINTAINER= oz@nixil.net COMMENT= Provides a non-blocking thread-safe API for resolving DNS names -BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent +BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2 -USES= libtool:keepla +USES= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS=--with-libevent=${LOCALBASE} Modified: head/devel/libdnsres/pkg-plist ============================================================================== --- head/devel/libdnsres/pkg-plist Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/libdnsres/pkg-plist Thu Jul 24 13:32:58 2014 (r362796) @@ -1,6 +1,5 @@ include/dnsres.h lib/libdnsres.a -lib/libdnsres.la lib/libdnsres.so lib/libdnsres.so.0 lib/libdnsres.so.0.0.1 Modified: head/devel/libevent2/Makefile ============================================================================== --- head/devel/libevent2/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/libevent2/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= libevent2 PORTVERSION= 2.0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://cloud.github.com/downloads/libevent/libevent/ DISTNAME= ${PORTNAME:S/2//}-${DISTVERSION}-stable @@ -11,39 +11,24 @@ DISTNAME= ${PORTNAME:S/2//}-${DISTVERSIO MAINTAINER= mm@FreeBSD.org COMMENT= API for executing callback functions on events or timeouts -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes -USES= libtool:oldver pathfix -USE_LDCONFIG= ${PREFIX}/lib/event2 +USES= libtool pathfix +USE_LDCOFNIG= yes OPTIONS_DEFINE= OPENSSL THREADS OPTIONS_DEFAULT= OPENSSL THREADS +OPTIONS_SUB= yes +INSTALL_TARGET= install-strip -CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/event2 +OPENSSL_USE= openssl=yes +OPENSSL_CPPFLAGS= -I${OPENSSLINC} +OPENSLS_LDFLAGS= -L${OPENSSLLIB} +OPENSSL_CONFIGURE_ENABLE= openssl -.include - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -PLIST_SUB+= OPENSSL="" -.else -CONFIGURE_ARGS+= --disable-openssl -PLIST_SUB+= OPENSSL="@comment " -.endif - -.if ${PORT_OPTIONS:MTHREADS} -PLIST_SUB+= THREADS="" -.else -CONFIGURE_ARGS+= --disable-thread-support -PLIST_SUB+= THREADS="@comment " -.endif - -post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${STAGEDIR}${PREFIX}/bin/event2_rpcgen.py +THREADS_CONFIGURE_ENABLE= support regression-test: build @(${SH} ${WRKSRC}/test/regress) Modified: head/devel/libevent2/pkg-plist ============================================================================== --- head/devel/libevent2/pkg-plist Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/libevent2/pkg-plist Thu Jul 24 13:32:58 2014 (r362796) @@ -1,62 +1,55 @@ -bin/event2_rpcgen.py -include/event2/compat/evdns.h -include/event2/compat/event.h -include/event2/compat/evhttp.h -include/event2/compat/evrpc.h -include/event2/compat/evutil.h -include/event2/keyvalq_struct.h -include/event2/util.h +bin/event_rpcgen.py +include/evdns.h +include/event.h +include/event2/buffer.h +include/event2/buffer_compat.h +include/event2/bufferevent.h +include/event2/bufferevent_compat.h +include/event2/bufferevent_ssl.h +include/event2/bufferevent_struct.h +include/event2/dns.h +include/event2/dns_compat.h +include/event2/dns_struct.h include/event2/event-config.h include/event2/event.h -include/event2/http_struct.h -include/event2/dns_compat.h -include/event2/thread.h -include/event2/rpc_struct.h -include/event2/tag_compat.h -include/event2/bufferevent_compat.h -include/event2/rpc.h -include/event2/bufferevent.h +include/event2/event_compat.h include/event2/event_struct.h -include/event2/tag.h -include/event2/listener.h -include/event2/bufferevent_ssl.h include/event2/http.h -include/event2/buffer_compat.h include/event2/http_compat.h -include/event2/dns.h -include/event2/buffer.h +include/event2/http_struct.h +include/event2/keyvalq_struct.h +include/event2/listener.h +include/event2/rpc.h include/event2/rpc_compat.h -include/event2/dns_struct.h -include/event2/event_compat.h -include/event2/bufferevent_struct.h -lib/event2/libevent-2.0.so -lib/event2/libevent-2.0.so.6 -lib/event2/libevent_core-2.0.so -lib/event2/libevent_core-2.0.so.6 -lib/event2/libevent_core.a -lib/event2/libevent_core.la -lib/event2/libevent_core.so -lib/event2/libevent_extra-2.0.so -lib/event2/libevent_extra-2.0.so.6 -lib/event2/libevent_extra.a -lib/event2/libevent_extra.la -lib/event2/libevent_extra.so -%%THREADS%%lib/event2/libevent_pthreads-2.0.so -%%THREADS%%lib/event2/libevent_pthreads-2.0.so.6 -%%THREADS%%lib/event2/libevent_pthreads.a -%%THREADS%%lib/event2/libevent_pthreads.la -%%THREADS%%lib/event2/libevent_pthreads.so -%%OPENSSL%%lib/event2/libevent_openssl-2.0.so -%%OPENSSL%%lib/event2/libevent_openssl-2.0.so.6 -%%OPENSSL%%lib/event2/libevent_openssl.a -%%OPENSSL%%lib/event2/libevent_openssl.la -%%OPENSSL%%lib/event2/libevent_openssl.so -lib/event2/libevent.a -lib/event2/libevent.la -lib/event2/libevent.so +include/event2/rpc_struct.h +include/event2/tag.h +include/event2/tag_compat.h +include/event2/thread.h +include/event2/util.h +include/evhttp.h +include/evrpc.h +include/evutil.h +lib/libevent-2.0.so.5 +lib/libevent-2.0.so.5.1.9 +lib/libevent.a +lib/libevent.so +lib/libevent_core-2.0.so.5 +lib/libevent_core-2.0.so.5.1.9 +lib/libevent_core.a +lib/libevent_core.so +lib/libevent_extra-2.0.so.5 +lib/libevent_extra-2.0.so.5.1.9 +lib/libevent_extra.a +lib/libevent_extra.so +%%OPENSSL%%lib/libevent_openssl-2.0.so.5 +%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.9 +%%OPENSSL%%lib/libevent_openssl.a +%%OPENSSL%%lib/libevent_openssl.so +%%THREADS%%lib/libevent_pthreads-2.0.so.5 +%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.9 +%%THREADS%%lib/libevent_pthreads.a +%%THREADS%%lib/libevent_pthreads.so libdata/pkgconfig/libevent.pc -%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc %%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc -@dirrm lib/event2 -@dirrm include/event2/compat +%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc @dirrm include/event2 Modified: head/devel/libmsocket/Makefile ============================================================================== --- head/devel/libmsocket/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/libmsocket/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -10,7 +10,7 @@ MASTER_SITES= SF/kageki/${PORTNAME}/${PO MAINTAINER= rodrigo@FreeBSD.org COMMENT= Socket abstraction library for C programmers -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 OPTIONS_DEFINE= DEBUG Modified: head/devel/ocaml-event/Makefile ============================================================================== --- head/devel/ocaml-event/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/ocaml-event/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= event PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.xs4all.nl/~mmzeeman/ocaml/ PKGNAMEPREFIX= ocaml- @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Ocaml wrapper for the libevent API BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 ALL_TARGET= all allopt USES= gmake Modified: head/devel/p5-Event-Lib/Makefile ============================================================================== --- head/devel/p5-Event-Lib/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/p5-Event-Lib/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= fk@fabiankeil.de COMMENT= Makes libevent(3) accessible with Perl -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 USES= perl5 USE_PERL5= configure Modified: head/devel/pecl-event/Makefile ============================================================================== --- head/devel/pecl-event/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/pecl-event/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,6 +3,7 @@ PORTNAME= event PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -14,7 +15,7 @@ COMMENT= Provides interface to libevent LICENSE= PHP301 -LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 USE_OPENSSL= yes CONFIGURE_ARGS= --with-openssl-dir=${OPENSSLBASE} Modified: head/devel/pecl-libevent/Makefile ============================================================================== --- head/devel/pecl-libevent/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/pecl-libevent/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,6 +3,7 @@ PORTNAME= libevent PORTVERSION= 0.0.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -14,7 +15,7 @@ COMMENT= Libevent extension for PHP LICENSE= PHP301 -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 USE_PHP= yes USE_PHP_BUILD= yes Modified: head/devel/pinba_engine/Makefile ============================================================================== --- head/devel/pinba_engine/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/pinba_engine/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= pinba_engine PORTVERSION= 2011.08.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/tony2001/pinba_engine/tarball/${GITVERSION}/ DISTNAME= tony2001-pinba_engine-${GITVERSION} @@ -12,7 +12,7 @@ MAINTAINER= raven428@gmail.com COMMENT= Mysql-engine part of statistics server for PHP BUILD_DEPENDS= ${LOCALBASE}/include/google/protobuf/descriptor.h:${PORTSDIR}/devel/protobuf \ - ${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent \ + ${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent2 \ ${LOCALBASE}/include/Judy.h:${PORTSDIR}/devel/judy \ ${LOCALBASE}/lib/mysql/plugin:${PORTSDIR}/${_MYSQL_SERVER} \ ${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \ Modified: head/devel/pinba_engine/pkg-plist ============================================================================== --- head/devel/pinba_engine/pkg-plist Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/pinba_engine/pkg-plist Thu Jul 24 13:32:58 2014 (r362796) @@ -3,4 +3,5 @@ lib/mysql/plugin/libpinba_engine.so.0 lib/mysql/plugin/libpinba_engine.la lib/mysql/plugin/libpinba_engine.a %%DATADIR%%/default_tables.sql +@dirrmtry lib/mysql/plugin @dirrm %%DATADIR%% Modified: head/devel/py-event/Makefile ============================================================================== --- head/devel/py-event/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/py-event/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= event PORTVERSION= 0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel net python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= clsung@FreeBSD.org COMMENT= Python bindings for libevent -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 PROJECTHOST= pyevent USE_PYTHON= yes Modified: head/devel/thrift-cpp/Makefile ============================================================================== --- head/devel/thrift-cpp/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/thrift-cpp/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -18,7 +18,7 @@ DISTNAME= thrift-${PORTVERSION} DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ - libevent-1.4.so:${PORTSDIR}/devel/libevent + libevent.so:${PORTSDIR}/devel/libevent2 USE_AUTOTOOLS= autoconf autoheader:env aclocal automake libtool ACLOCAL_ARGS= -I${WRKSRC}/aclocal Modified: head/devel/thrift/bsd.thrift.mk ============================================================================== --- head/devel/thrift/bsd.thrift.mk Thu Jul 24 13:24:19 2014 (r362795) +++ head/devel/thrift/bsd.thrift.mk Thu Jul 24 13:32:58 2014 (r362796) @@ -6,6 +6,7 @@ # PORTVERSION= ${THRIFT_PORTVERSION} # see $PORTSDIR/devel/thrift for examples THRIFT_PORTVERSION= 0.9.1 +THRIFT_PORTREVISION= 1 CONFIGURE_ARGS+= \ --without-tests Modified: head/dns/adsuck/Makefile ============================================================================== --- head/dns/adsuck/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/dns/adsuck/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= adsuck PORTVERSION= 2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MASTER_SITES= http://opensource.conformal.com/snapshots/adsuck/ \ http://philpep.org/pub/ @@ -14,12 +14,10 @@ COMMENT= DNS relay for ad blocking LICENSE= ISCL -LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 \ +LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 \ libldns.so:${PORTSDIR}/dns/ldns -CFLAGS+= -I${LOCALBASE}/include/event2/compat \ - -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/event2 +CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= adsuck @@ -30,9 +28,6 @@ SUB_FILES+= pkg-message OPTIONS_DEFINE= EXAMPLES -post-patch: - @${REINPLACE_CMD} -e "s/-levent/-levent-2.0/g" ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/adsuck ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8.gz ${STAGEDIR}${MANPREFIX}/man/man8 Modified: head/dns/dnsproxy/Makefile ============================================================================== --- head/dns/dnsproxy/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/dns/dnsproxy/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,13 +3,14 @@ PORTNAME= dnsproxy PORTVERSION= 1.16 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.wolfermann.org/ MAINTAINER= ports@FreeBSD.org COMMENT= proxy for DNS queries -BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 GNU_CONFIGURE= yes Modified: head/dns/getdns/Makefile ============================================================================== --- head/dns/getdns/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/dns/getdns/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -37,7 +37,7 @@ LIBEV_LIB_DEPENDS= libev.so:${PORTSDIR}/ LIBEV_CONFIGURE_WITH= libev LIBUV_LIB_DEPENDS= libuv.so:${PORTSDIR}/devel/libuv LIBUV_CONFIGURE_WITH= libuv -LIBEVENT_LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIBEVENT_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent LIBEVENT_CONFIGURE_WITH=libevent .include Modified: head/dns/nsd/Makefile ============================================================================== --- head/dns/nsd/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/dns/nsd/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,6 +3,7 @@ PORTNAME= nsd PORTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -62,7 +63,7 @@ RRL_DESC= Response Rate Limiting EUI_RRTYPES_DESC= EUI48 and EUI64 RRtypes support RECVMMSG_DESC= Enable use of recvmmsg and sendmmsg -LIB_DEPENDS+= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 ROOT_SERVER_CONFIGURE_ENABLE= root-server LARGEFILE_CONFIGURE_ENABLE= largefile Modified: head/dns/unbound/Makefile ============================================================================== --- head/dns/unbound/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/dns/unbound/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -29,15 +29,11 @@ PORTDOCS= CREDITS Changelog FEATURES LIC ietf67-design-02.pdf requirements.txt PLIST_SUB+= PYTHON=${PYTHON} MUNIN=${MUNIN} -OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN DOCS +OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT OPTIONS_DEFAULT=THREADS ECDSA -OPTIONS_RADIO= LIBEVENT -OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20 -LIBEVENT_DESC= Enable whenever using many (10000) outgoing ports -LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent) -LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2) +LIBEVENT_DESC= Build against libevent (devel/libevent2) GOST_DESC= Enable GOST support (requires OpenSSL >= 1.0) ECDSA_DESC= Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0) MUNIN_DESC= Install Munin plugin @@ -83,14 +79,10 @@ MUNIN= MUNIN= "@comment " .endif -.if ${PORT_OPTIONS:MLIBEVENT14} -LIB_DEPENDS+= libevent-1.4.so:${PORTSDIR}/devel/libevent -CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} -.elif ${PORT_OPTIONS:MLIBEVENT20} -LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +.if ${PORT_OPTIONS:MLIBEVENT} +LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 USES+= pkgconfig -CONFIGURE_ARGS+=--with-libevent=${NONEXISTENT} -CONFIGURE_ENV+= found_libevent=yes +CONFIGURE_ARGS+=--with-libevent CPPFLAGS+= $$(pkg-config libevent --cflags-only-I) LDFLAGS+= $$(pkg-config libevent --libs-only-L) .else Modified: head/lang/io/Makefile.addons ============================================================================== --- head/lang/io/Makefile.addons Thu Jul 24 13:24:19 2014 (r362795) +++ head/lang/io/Makefile.addons Thu Jul 24 13:32:58 2014 (r362796) @@ -243,7 +243,7 @@ LIB_DEPENDS+= libsamplerate.so:${PORTSDI # Socket # .if ${PORT_OPTIONS:MSocket} -LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 .endif # Modified: head/mail/dbmail/Makefile ============================================================================== --- head/mail/dbmail/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/mail/dbmail/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= dbmail PORTVERSION= 3.1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://git.dbmail.eu/paul/dbmail/snapshot/ @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \ libzdb.so:${PORTSDIR}/databases/libzdb \ libmhash.so:${PORTSDIR}/security/mhash \ - libevent-2.0.so:${PORTSDIR}/devel/libevent2 + libevent.so:${PORTSDIR}/devel/libevent2 BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto \ Modified: head/mail/opensmtpd-devel/Makefile ============================================================================== --- head/mail/opensmtpd-devel/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/mail/opensmtpd-devel/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= opensmtpd PORTVERSION= 201405202105 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -17,7 +17,7 @@ COMMENT= OpenSMTPD is a free MTA (develo LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 OPENSMTPD_SNAPSHOT_VER= p1 Modified: head/mail/opensmtpd/Makefile ============================================================================== --- head/mail/opensmtpd/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/mail/opensmtpd/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= opensmtpd PORTVERSION= 5.4.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -15,7 +15,7 @@ COMMENT= OpenSMTPD is a free MTA LICENSE= ISCL -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/mail/rspamd/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -2,7 +2,7 @@ PORTNAME= rspamd PORTVERSION= 0.6.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \ - libevent.so:${PORTSDIR}/devel/libevent + libevent.so:${PORTSDIR}/devel/libevent2 OPTIONS_DEFINE= GPERF REDIRECTOR GPERF_DESC= google perf-tools profiling Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/mail/thunderbird/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 24.6.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/ Modified: head/net-p2p/transmission-cli/Makefile ============================================================================== --- head/net-p2p/transmission-cli/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/net-p2p/transmission-cli/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -2,7 +2,7 @@ PORTNAME= transmission PORTVERSION= 2.84 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net-p2p #MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ MASTER_SITES= http://transmission.cachefly.net/ @@ -34,7 +34,7 @@ LIB_DEPENDS?= ${GEN_LIB_DEPENDS} # General dependencies GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \ - libevent-2.0.so.6:${PORTSDIR}/devel/libevent2 + libevent.so:${PORTSDIR}/devel/libevent2 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web # This is master port of transmission-*, so don't override USES definition Modified: head/net-p2p/tribler/Makefile ============================================================================== --- head/net-p2p/tribler/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/net-p2p/tribler/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= tribler PORTVERSION= 6.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-p2p #MASTER_SITES= http://dl.tribler.org/ MASTER_SITES= GENTOO/distfiles \ @@ -20,7 +20,7 @@ LICENSE= LGPL21 MIT LICENSE_COMB= multi EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 \ +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 \ libvlc.so:${PORTSDIR}/multimedia/vlc RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \ @@ -65,9 +65,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2|| ; \ s|CPPFLAGS|CXXFLAGS| ; \ s|-g -I$${LIBEVENT_HOME}/include|-I$${LOCALBASE}/include| ; \ - s|-levent -lstdc++|-levent-2.0| ; \ + s|-lstdc++|| ; \ s|g++|$${CXX}| ; \ - s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib/event2|g' \ + s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib|g' \ ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine/Makefile @${REINPLACE_CMD} 's|linux|freebsd|' \ ${WRKDIR}/usr/share/tribler/Tribler/vlc.py Modified: head/net-p2p/unworkable/Makefile ============================================================================== --- head/net-p2p/unworkable/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/net-p2p/unworkable/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,13 +3,14 @@ PORTNAME= unworkable PORTVERSION= 0.53 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= GOOGLE_CODE MAINTAINER= wenheping@gmail.com COMMENT= Free BitTorrent Implementation -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 USES= scons USE_OPENSSL= yes Modified: head/net/aprsc/Makefile ============================================================================== --- head/net/aprsc/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/net/aprsc/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -2,7 +2,7 @@ PORTNAME= aprsc PORTVERSION= 2.0.14 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= .g28c5a6a CATEGORIES= net hamradio MASTER_SITES= http://he.fi/aprsc/down/ \ @@ -15,10 +15,10 @@ COMMENT= Plain APRS-IS server LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/event2 +LDFLAGS+= -L${LOCALBASE}/lib MAKEFILE= GNUmakefile WRKSRC= ${WRKDIR}/${DISTNAME}/src Modified: head/net/honeyd/Makefile ============================================================================== --- head/net/honeyd/Makefile Thu Jul 24 13:24:19 2014 (r362795) +++ head/net/honeyd/Makefile Thu Jul 24 13:32:58 2014 (r362796) @@ -3,7 +3,7 @@ PORTNAME= honeyd PORTVERSION= 1.5c -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= http://www.honeyd.org/uploads/ \ http://www.citi.umich.edu/u/provos/honeyd/ @@ -13,7 +13,7 @@ COMMENT= Simulate virtual network hosts LICENSE= GPLv2 -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent \ +LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***