Update to version 3.4.9.

Pkgsrc changes:
 * fix up the set of REPLACE_PYTHON settings to match
 * remove patch which has been accepted upstream, adapt remaining patch
 * install the newly contributed man pages
 * adapt PLIST

Upstream changes:
3.4.9:
  This release mostly fixes a very embarrassing issue introduced with
  3.4.8 with non IPv4 unicast route decoding, the handlers were badly
  registered.

3.4.8:
  This is a bug fix release. It fixes an obscure bug when routes
  would not reach the backend API as two NLRI could be seen as
  identical due to a bad hashing of the attributes.

  * Fix: bug with multiple configuration files
  * Fix: allow generic attribute not only in single line but also
    in multiple lines patch by: Eiichiro Watanabe (issue #214)
  * Fix: issue with parsing extended-community origin reported by: Tim Preston
  * Fix: handle numeric community parsing correctly reported by: Aaron Kalin
  * Fix: bug in AS_PATH with AS_SET handling patch by: Eiichiro Watanabe
  * Fix: off by one for the maximum message size generation reported
    by: Eiichiro Watanabe
  * Fix: issue with handling of some generic attributes reported
    by: Hiroshi Yokoi
  * Fix: restore old api syntax broken by mistake patch by: David Waring
  * Fix: issue with E-VPN NLRI patch by: Thomas Morin
  * Fix: bad iteration for JSON generation ( bug created during
    3.4.8 dev ) patch by: Ian bobbitt
  * Fix: healthcheck.py: optionally match "alias" in ifconfig output
    patch by: Havard Eidnes
  * Fix: healthcheck.py: make the ifconfig path work; regexp fix
    patch by: Havard Eidnes
  * Change: moved the netlink library within exabgp
  * Feature: qa/bin/ip and qa/bin/route

5 files changed, 117 insertions, 100 deletions

diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index 4e2b59145b9..86b7c4f8022 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2015/03/02 23:22:01 sevan Exp $
+# $NetBSD: Makefile,v 1.12 2015/03/19 09:20:30 he Exp $
 
-VERSION=	3.4.7
+VERSION=	3.4.9
 DISTNAME=	${VERSION}
 PKGNAME=	exabgp-${VERSION}
 EGG_NAME=	exabgp-${VERSION}
@@ -20,14 +20,12 @@ USE_TOOLS+=	perl:run
 DEPENDS+=	${PYPKGPREFIX}-ipaddr>=0:../../devel/py-ipaddr
 DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-REPLACE_PERL=		etc/exabgp/processes/dynamic-1.pl
+REPLACE_PERL+=		etc/exabgp/processes/dynamic-1.pl
 REPLACE_PERL+=		etc/exabgp/processes/watchdog-1.pl
-REPLACE_PYTHON=		lib/exabgp/application/bmp.py
-REPLACE_PYTHON+=	lib/exabgp/bgp/message/update/nlri/eor.py
+REPLACE_PYTHON+=	lib/exabgp/application/bmp.py
+REPLACE_PYTHON+=	lib/exabgp/application/cli.py
+REPLACE_PYTHON+=	lib/exabgp/netlink/route.py
 REPLACE_PYTHON+=	lib/exabgp/reactor/api/encoding.py
-REPLACE_PYTHON+=	lib/netlink/route.py
-REPLACE_PYTHON+=	lib/netlink/test/get.py
-REPLACE_PYTHON+=	lib/netlink/test/route.py
 REPLACE_PYTHON+=	etc/exabgp/processes/healthcheck.py
 REPLACE_PYTHON+=	etc/exabgp/processes/read-write.py
 REPLACE_PYTHON+=	etc/exabgp/processes/tcp-server
@@ -38,11 +36,17 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.2.19
 
 USE_LANGUAGES=  # none
 
-INSTALLATION_DIRS=	share/exabgp bin
+INSTALLATION_DIRS=	share/exabgp bin man/man1 man/man5
 
 pre-install:
 	find ${WRKDIR} -name "*.orig" | xargs rm -f
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/man/exabgp.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/exabgp.conf.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/pyversion.mk"
diff --git a/net/exabgp/PLIST b/net/exabgp/PLIST
index a4686db0264..823a512d873 100644
--- a/net/exabgp/PLIST
+++ b/net/exabgp/PLIST
@@ -1,14 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2015/02/19 12:23:52 he Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/03/19 09:20:30 he Exp $
 bin/exabgp
-share/exabgp/dynamic-1.pl
-share/exabgp/dynamic-1.sh
-share/exabgp/healthcheck.py
-share/exabgp/read-write.py
-share/exabgp/stderr-1.py
-share/exabgp/syslog-1.py
-share/exabgp/tcp-server
-share/exabgp/watchdog-1.pl
-share/exabgp/watchdog-1.sh
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
@@ -38,6 +29,9 @@ ${PYSITELIB}/exabgp/bgp/message/__init__.pyo
 ${PYSITELIB}/exabgp/bgp/message/keepalive.py
 ${PYSITELIB}/exabgp/bgp/message/keepalive.pyc
 ${PYSITELIB}/exabgp/bgp/message/keepalive.pyo
+${PYSITELIB}/exabgp/bgp/message/message.py
+${PYSITELIB}/exabgp/bgp/message/message.pyc
+${PYSITELIB}/exabgp/bgp/message/message.pyo
 ${PYSITELIB}/exabgp/bgp/message/nop.py
 ${PYSITELIB}/exabgp/bgp/message/nop.pyc
 ${PYSITELIB}/exabgp/bgp/message/nop.pyo
@@ -59,6 +53,12 @@ ${PYSITELIB}/exabgp/bgp/message/open/capability/addpath.pyo
 ${PYSITELIB}/exabgp/bgp/message/open/capability/asn4.py
 ${PYSITELIB}/exabgp/bgp/message/open/capability/asn4.pyc
 ${PYSITELIB}/exabgp/bgp/message/open/capability/asn4.pyo
+${PYSITELIB}/exabgp/bgp/message/open/capability/capabilities.py
+${PYSITELIB}/exabgp/bgp/message/open/capability/capabilities.pyc
+${PYSITELIB}/exabgp/bgp/message/open/capability/capabilities.pyo
+${PYSITELIB}/exabgp/bgp/message/open/capability/capability.py
+${PYSITELIB}/exabgp/bgp/message/open/capability/capability.pyc
+${PYSITELIB}/exabgp/bgp/message/open/capability/capability.pyo
 ${PYSITELIB}/exabgp/bgp/message/open/capability/graceful.py
 ${PYSITELIB}/exabgp/bgp/message/open/capability/graceful.pyc
 ${PYSITELIB}/exabgp/bgp/message/open/capability/graceful.pyo
@@ -119,15 +119,30 @@ ${PYSITELIB}/exabgp/bgp/message/update/attribute/atomicaggregate.pyo
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/attribute.py
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/attribute.pyc
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/attribute.pyo
+${PYSITELIB}/exabgp/bgp/message/update/attribute/attributes.py
+${PYSITELIB}/exabgp/bgp/message/update/attribute/attributes.pyc
+${PYSITELIB}/exabgp/bgp/message/update/attribute/attributes.pyo
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/clusterlist.py
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/clusterlist.pyc
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/clusterlist.pyo
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/__init__.py
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/__init__.pyc
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/__init__.pyo
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/communities.py
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/communities.pyc
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/communities.pyo
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/community.py
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/community.pyc
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/community.pyo
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/__init__.py
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/__init__.pyc
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/__init__.pyo
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/communities.py
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/communities.pyc
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/communities.pyo
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/community.py
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/community.pyc
+${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/community.pyo
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/encapsulation.py
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/encapsulation.pyc
 ${PYSITELIB}/exabgp/bgp/message/update/attribute/community/extended/encapsulation.pyo
@@ -257,15 +272,6 @@ ${PYSITELIB}/exabgp/bmp/negotiated.pyo
 ${PYSITELIB}/exabgp/bmp/peer.py
 ${PYSITELIB}/exabgp/bmp/peer.pyc
 ${PYSITELIB}/exabgp/bmp/peer.pyo
-${PYSITELIB}/exabgp/compatibility/__init__.py
-${PYSITELIB}/exabgp/compatibility/__init__.pyc
-${PYSITELIB}/exabgp/compatibility/__init__.pyo
-${PYSITELIB}/exabgp/compatibility/ipaddress.py
-${PYSITELIB}/exabgp/compatibility/ipaddress.pyc
-${PYSITELIB}/exabgp/compatibility/ipaddress.pyo
-${PYSITELIB}/exabgp/compatibility/ordereddict.py
-${PYSITELIB}/exabgp/compatibility/ordereddict.pyc
-${PYSITELIB}/exabgp/compatibility/ordereddict.pyo
 ${PYSITELIB}/exabgp/configuration/__init__.py
 ${PYSITELIB}/exabgp/configuration/__init__.pyc
 ${PYSITELIB}/exabgp/configuration/__init__.pyo
@@ -275,6 +281,9 @@ ${PYSITELIB}/exabgp/configuration/ancient.pyo
 ${PYSITELIB}/exabgp/configuration/bgp/__init__.py
 ${PYSITELIB}/exabgp/configuration/bgp/__init__.pyc
 ${PYSITELIB}/exabgp/configuration/bgp/__init__.pyo
+${PYSITELIB}/exabgp/configuration/bgp/asn.py
+${PYSITELIB}/exabgp/configuration/bgp/asn.pyc
+${PYSITELIB}/exabgp/configuration/bgp/asn.pyo
 ${PYSITELIB}/exabgp/configuration/bgp/capability.py
 ${PYSITELIB}/exabgp/configuration/bgp/capability.pyc
 ${PYSITELIB}/exabgp/configuration/bgp/capability.pyo
@@ -311,9 +320,6 @@ ${PYSITELIB}/exabgp/configuration/engine/raised.pyo
 ${PYSITELIB}/exabgp/configuration/engine/reader.py
 ${PYSITELIB}/exabgp/configuration/engine/reader.pyc
 ${PYSITELIB}/exabgp/configuration/engine/reader.pyo
-${PYSITELIB}/exabgp/configuration/engine/registry.py
-${PYSITELIB}/exabgp/configuration/engine/registry.pyc
-${PYSITELIB}/exabgp/configuration/engine/registry.pyo
 ${PYSITELIB}/exabgp/configuration/engine/section.py
 ${PYSITELIB}/exabgp/configuration/engine/section.pyc
 ${PYSITELIB}/exabgp/configuration/engine/section.pyo
@@ -323,12 +329,18 @@ ${PYSITELIB}/exabgp/configuration/engine/tokeniser.pyo
 ${PYSITELIB}/exabgp/configuration/environment.py
 ${PYSITELIB}/exabgp/configuration/environment.pyc
 ${PYSITELIB}/exabgp/configuration/environment.pyo
+${PYSITELIB}/exabgp/configuration/format.py
+${PYSITELIB}/exabgp/configuration/format.pyc
+${PYSITELIB}/exabgp/configuration/format.pyo
 ${PYSITELIB}/exabgp/configuration/neighbor/capability.py
 ${PYSITELIB}/exabgp/configuration/neighbor/capability.pyc
 ${PYSITELIB}/exabgp/configuration/neighbor/capability.pyo
 ${PYSITELIB}/exabgp/configuration/setup.py
 ${PYSITELIB}/exabgp/configuration/setup.pyc
 ${PYSITELIB}/exabgp/configuration/setup.pyo
+${PYSITELIB}/exabgp/configuration/show/__init__.py
+${PYSITELIB}/exabgp/configuration/show/__init__.pyc
+${PYSITELIB}/exabgp/configuration/show/__init__.pyo
 ${PYSITELIB}/exabgp/configuration/usage.py
 ${PYSITELIB}/exabgp/configuration/usage.pyc
 ${PYSITELIB}/exabgp/configuration/usage.pyo
@@ -347,30 +359,42 @@ ${PYSITELIB}/exabgp/dep/__init__.pyo
 ${PYSITELIB}/exabgp/dep/cmd2.py
 ${PYSITELIB}/exabgp/dep/cmd2.pyc
 ${PYSITELIB}/exabgp/dep/cmd2.pyo
+${PYSITELIB}/exabgp/dep/counter.py
+${PYSITELIB}/exabgp/dep/counter.pyc
+${PYSITELIB}/exabgp/dep/counter.pyo
 ${PYSITELIB}/exabgp/dep/docopt.py
 ${PYSITELIB}/exabgp/dep/docopt.pyc
 ${PYSITELIB}/exabgp/dep/docopt.pyo
+${PYSITELIB}/exabgp/dep/gcdump.py
+${PYSITELIB}/exabgp/dep/gcdump.pyc
+${PYSITELIB}/exabgp/dep/gcdump.pyo
+${PYSITELIB}/exabgp/dep/ipaddress.py
+${PYSITELIB}/exabgp/dep/ipaddress.pyc
+${PYSITELIB}/exabgp/dep/ipaddress.pyo
 ${PYSITELIB}/exabgp/dep/lsprofcalltree.py
 ${PYSITELIB}/exabgp/dep/lsprofcalltree.pyc
 ${PYSITELIB}/exabgp/dep/lsprofcalltree.pyo
+${PYSITELIB}/exabgp/dep/objgraph.py
+${PYSITELIB}/exabgp/dep/objgraph.pyc
+${PYSITELIB}/exabgp/dep/objgraph.pyo
+${PYSITELIB}/exabgp/dep/ordereddict.py
+${PYSITELIB}/exabgp/dep/ordereddict.pyc
+${PYSITELIB}/exabgp/dep/ordereddict.pyo
+${PYSITELIB}/exabgp/dep/profiler.py
+${PYSITELIB}/exabgp/dep/profiler.pyc
+${PYSITELIB}/exabgp/dep/profiler.pyo
 ${PYSITELIB}/exabgp/dep/pyparsing.py
 ${PYSITELIB}/exabgp/dep/pyparsing.pyc
 ${PYSITELIB}/exabgp/dep/pyparsing.pyo
 ${PYSITELIB}/exabgp/logger.py
 ${PYSITELIB}/exabgp/logger.pyc
 ${PYSITELIB}/exabgp/logger.pyo
-${PYSITELIB}/exabgp/memory/__init__.py
-${PYSITELIB}/exabgp/memory/__init__.pyc
-${PYSITELIB}/exabgp/memory/__init__.pyo
-${PYSITELIB}/exabgp/memory/gcdump.py
-${PYSITELIB}/exabgp/memory/gcdump.pyc
-${PYSITELIB}/exabgp/memory/gcdump.pyo
-${PYSITELIB}/exabgp/memory/objgraph.py
-${PYSITELIB}/exabgp/memory/objgraph.pyc
-${PYSITELIB}/exabgp/memory/objgraph.pyo
-${PYSITELIB}/exabgp/memory/profiler.py
-${PYSITELIB}/exabgp/memory/profiler.pyc
-${PYSITELIB}/exabgp/memory/profiler.pyo
+${PYSITELIB}/exabgp/netlink/__init__.py
+${PYSITELIB}/exabgp/netlink/__init__.pyc
+${PYSITELIB}/exabgp/netlink/__init__.pyo
+${PYSITELIB}/exabgp/netlink/route.py
+${PYSITELIB}/exabgp/netlink/route.pyc
+${PYSITELIB}/exabgp/netlink/route.pyo
 ${PYSITELIB}/exabgp/protocol/__init__.py
 ${PYSITELIB}/exabgp/protocol/__init__.pyc
 ${PYSITELIB}/exabgp/protocol/__init__.pyo
@@ -401,9 +425,21 @@ ${PYSITELIB}/exabgp/reactor/__init__.pyo
 ${PYSITELIB}/exabgp/reactor/api/__init__.py
 ${PYSITELIB}/exabgp/reactor/api/__init__.pyc
 ${PYSITELIB}/exabgp/reactor/api/__init__.pyo
-${PYSITELIB}/exabgp/reactor/api/decoding.py
-${PYSITELIB}/exabgp/reactor/api/decoding.pyc
-${PYSITELIB}/exabgp/reactor/api/decoding.pyo
+${PYSITELIB}/exabgp/reactor/api/command.py
+${PYSITELIB}/exabgp/reactor/api/command.pyc
+${PYSITELIB}/exabgp/reactor/api/command.pyo
+${PYSITELIB}/exabgp/reactor/api/control.py
+${PYSITELIB}/exabgp/reactor/api/control.pyc
+${PYSITELIB}/exabgp/reactor/api/control.pyo
+${PYSITELIB}/exabgp/reactor/api/decoder/__init__.py
+${PYSITELIB}/exabgp/reactor/api/decoder/__init__.pyc
+${PYSITELIB}/exabgp/reactor/api/decoder/__init__.pyo
+${PYSITELIB}/exabgp/reactor/api/decoder/json.py
+${PYSITELIB}/exabgp/reactor/api/decoder/json.pyc
+${PYSITELIB}/exabgp/reactor/api/decoder/json.pyo
+${PYSITELIB}/exabgp/reactor/api/decoder/text.py
+${PYSITELIB}/exabgp/reactor/api/decoder/text.pyc
+${PYSITELIB}/exabgp/reactor/api/decoder/text.pyo
 ${PYSITELIB}/exabgp/reactor/api/encoding.py
 ${PYSITELIB}/exabgp/reactor/api/encoding.pyc
 ${PYSITELIB}/exabgp/reactor/api/encoding.pyo
@@ -416,6 +452,9 @@ ${PYSITELIB}/exabgp/reactor/daemon.pyo
 ${PYSITELIB}/exabgp/reactor/listener.py
 ${PYSITELIB}/exabgp/reactor/listener.pyc
 ${PYSITELIB}/exabgp/reactor/listener.pyo
+${PYSITELIB}/exabgp/reactor/loop.py
+${PYSITELIB}/exabgp/reactor/loop.pyc
+${PYSITELIB}/exabgp/reactor/loop.pyo
 ${PYSITELIB}/exabgp/reactor/network/__init__.py
 ${PYSITELIB}/exabgp/reactor/network/__init__.pyc
 ${PYSITELIB}/exabgp/reactor/network/__init__.pyo
@@ -449,36 +488,27 @@ ${PYSITELIB}/exabgp/rib/change.pyo
 ${PYSITELIB}/exabgp/rib/store.py
 ${PYSITELIB}/exabgp/rib/store.pyc
 ${PYSITELIB}/exabgp/rib/store.pyo
-${PYSITELIB}/exabgp/test/json.py
-${PYSITELIB}/exabgp/test/json.pyc
-${PYSITELIB}/exabgp/test/json.pyo
-${PYSITELIB}/exabgp/test/loader.py
-${PYSITELIB}/exabgp/test/loader.pyc
-${PYSITELIB}/exabgp/test/loader.pyo
-${PYSITELIB}/exabgp/test/validation.py
-${PYSITELIB}/exabgp/test/validation.pyc
-${PYSITELIB}/exabgp/test/validation.pyo
 ${PYSITELIB}/exabgp/util/__init__.py
 ${PYSITELIB}/exabgp/util/__init__.pyc
 ${PYSITELIB}/exabgp/util/__init__.pyo
 ${PYSITELIB}/exabgp/util/cache.py
 ${PYSITELIB}/exabgp/util/cache.pyc
 ${PYSITELIB}/exabgp/util/cache.pyo
-${PYSITELIB}/exabgp/util/cmd2.py
-${PYSITELIB}/exabgp/util/cmd2.pyc
-${PYSITELIB}/exabgp/util/cmd2.pyo
 ${PYSITELIB}/exabgp/util/coroutine.py
 ${PYSITELIB}/exabgp/util/coroutine.pyc
 ${PYSITELIB}/exabgp/util/coroutine.pyo
-${PYSITELIB}/exabgp/util/counter.py
-${PYSITELIB}/exabgp/util/counter.pyc
-${PYSITELIB}/exabgp/util/counter.pyo
+${PYSITELIB}/exabgp/util/dictionary.py
+${PYSITELIB}/exabgp/util/dictionary.pyc
+${PYSITELIB}/exabgp/util/dictionary.pyo
 ${PYSITELIB}/exabgp/util/enumeration.py
 ${PYSITELIB}/exabgp/util/enumeration.pyc
 ${PYSITELIB}/exabgp/util/enumeration.pyo
 ${PYSITELIB}/exabgp/util/errstr.py
 ${PYSITELIB}/exabgp/util/errstr.pyc
 ${PYSITELIB}/exabgp/util/errstr.pyo
+${PYSITELIB}/exabgp/util/hashtable.py
+${PYSITELIB}/exabgp/util/hashtable.pyc
+${PYSITELIB}/exabgp/util/hashtable.pyo
 ${PYSITELIB}/exabgp/util/ip.py
 ${PYSITELIB}/exabgp/util/ip.pyc
 ${PYSITELIB}/exabgp/util/ip.pyo
@@ -497,15 +527,14 @@ ${PYSITELIB}/exabgp/util/usage.pyo
 ${PYSITELIB}/exabgp/version.py
 ${PYSITELIB}/exabgp/version.pyc
 ${PYSITELIB}/exabgp/version.pyo
-${PYSITELIB}/netlink/__init__.py
-${PYSITELIB}/netlink/__init__.pyc
-${PYSITELIB}/netlink/__init__.pyo
-${PYSITELIB}/netlink/route.py
-${PYSITELIB}/netlink/route.pyc
-${PYSITELIB}/netlink/route.pyo
-${PYSITELIB}/netlink/test/get.py
-${PYSITELIB}/netlink/test/get.pyc
-${PYSITELIB}/netlink/test/get.pyo
-${PYSITELIB}/netlink/test/route.py
-${PYSITELIB}/netlink/test/route.pyc
-${PYSITELIB}/netlink/test/route.pyo
+share/exabgp/dynamic-1.pl
+share/exabgp/dynamic-1.sh
+share/exabgp/healthcheck.py
+share/exabgp/read-write.py
+share/exabgp/stderr-1.py
+share/exabgp/syslog-1.py
+share/exabgp/tcp-server
+share/exabgp/watchdog-1.pl
+share/exabgp/watchdog-1.sh
+man/man1/exabgp.1
+man/man5/exabgp.conf.5
diff --git a/net/exabgp/distinfo b/net/exabgp/distinfo
index e4b68891041..b325c08c3b9 100644
--- a/net/exabgp/distinfo
+++ b/net/exabgp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/02/19 12:23:52 he Exp $
+$NetBSD: distinfo,v 1.8 2015/03/19 09:20:30 he Exp $
 
-SHA1 (exabgp/3.4.7.tar.gz) = 5fccd3e4215581bc073e0a86a36875f6ed7a25f3
-RMD160 (exabgp/3.4.7.tar.gz) = 390018a498722724a3085fdb066e8331db91460a
-Size (exabgp/3.4.7.tar.gz) = 548464 bytes
-SHA1 (patch-etc_exabgp_processes_healthcheck.py) = 7c0b9ab3bf7afe75d245922a9b8ed0e64c4503f4
-SHA1 (patch-setup.py) = 9863e53efe87323ecd7808f9d550e005273a4feb
+SHA1 (exabgp/3.4.9.tar.gz) = 7d3dcd6a4cbc7ca02fc330f653a22b0ef63545de
+RMD160 (exabgp/3.4.9.tar.gz) = d89e59472202cea5479677875ba20fdcb8b1099b
+Size (exabgp/3.4.9.tar.gz) = 532690 bytes
+SHA1 (patch-setup.py) = 8181a726cead85e6e06d49f9b474ac97210a069c
diff --git a/net/exabgp/patches/patch-etc_exabgp_processes_healthcheck.py b/net/exabgp/patches/patch-etc_exabgp_processes_healthcheck.py
deleted file mode 100644
index ac82d7e1ad3..00000000000
--- a/net/exabgp/patches/patch-etc_exabgp_processes_healthcheck.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-etc_exabgp_processes_healthcheck.py,v 1.2 2015/02/19 12:23:52 he Exp $
-
-Also match interface alias addresses, and spaces at the front
-are already removed after strip().
-
---- etc/exabgp/processes/healthcheck.py.orig	2014-03-25 19:39:16.000000000 +0000
-+++ etc/exabgp/processes/healthcheck.py
-@@ -222,7 +222,7 @@ def loopback_ips(label):
-         cmd = subprocess.Popen("/sbin/ip -o address show dev lo".split(), shell=False, stdout=subprocess.PIPE)
-     else:
-         # Try with ifconfig
--        ipre = re.compile(r"^\s+inet6?\s+(?P<ip>[\da-f.:]+)\s+(?:netmask 0x(?P<netmask>[0-9a-f]+)|prefixlen (?P<mask>\d+)).*")
-+        ipre = re.compile(r"^inet6?\s+(alias )?(?P<ip>[\da-f.:]+)\s+(?:netmask 0x(?P<netmask>[0-9a-f]+)|prefixlen (?P<mask>\d+)).*")
-         cmd = subprocess.Popen("/sbin/ifconfig lo0".split(), shell=False, stdout=subprocess.PIPE)
-         labelre = re.compile(r"")
-     for line in cmd.stdout:
diff --git a/net/exabgp/patches/patch-setup.py b/net/exabgp/patches/patch-setup.py
index ab22ff39cab..29c82056cb4 100644
--- a/net/exabgp/patches/patch-setup.py
+++ b/net/exabgp/patches/patch-setup.py
@@ -1,18 +1,19 @@
-$NetBSD: patch-setup.py,v 1.3 2015/02/19 12:23:52 he Exp $
+$NetBSD: patch-setup.py,v 1.4 2015/03/19 09:20:30 he Exp $
 
-Do away with the special handling for NetBSD, to avoid PLIST issues.
+Do away with the special handling for NetBSD, to avoid PLIST issues
+between different pkgsrc-using platforms.
 Install helper scripts outside of the config tree (use share/exabgp).
 On the other hand, only do the systemd dance on Linux.
 
---- setup.py.orig	2015-01-08 09:15:39.000000000 +0000
+--- setup.py.orig	2015-03-14 15:32:13.000000000 +0000
 +++ setup.py
-@@ -371,14 +371,10 @@ def configuration (etc):
+@@ -364,14 +364,10 @@ def configuration (etc):
  
  os_name = platform.system()
  
 -if os_name == 'NetBSD':
 -	files_definition= [
--		('bin/exabgp',configuration('etc/exabgp')),
+-		('share/exabgp',configuration('etc/exabgp')),
 -	]
 -else:
 -	files_definition = [