Update openbgpd to 3.9.

Reminded by:	osa

6 files changed, 16 insertions, 16 deletions

diff --git a/net/openbgpd-devel/Makefile b/net/openbgpd-devel/Makefile
index 021d54045a92..4274c47db71b 100644
--- a/net/openbgpd-devel/Makefile
+++ b/net/openbgpd-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	openbgpd-devel
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	0
 CATEGORIES=	net
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:freebsd \
-		hash.h:freebsd strtonum.c:freebsd
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:freebsd
 SNAPSHOT=	20060516
 
 MAINTAINER=	flz@FreeBSD.org
@@ -21,11 +20,6 @@ CONFLICTS=	zebra-0* quagga-0* openbgpd-devel-*
 MASTERDIR=	${.CURDIR}/../openbgpd
 MD5_FILE=	${.CURDIR}/distinfo
 
-EXTRA_PATCHES=	${.CURDIR}/files/devel-bgpd_bgpd.8 \
-		${.CURDIR}/files/devel-bgpd_kroute.c \
-		${.CURDIR}/files/devel-bgpctl_bgpctl.c \
-		${.CURDIR}/files/devel-bgpctl_parser.c
-
-COPTS+=		-DRTA_LABEL=0
+EXTRA_PATCHES=	${.CURDIR}/files/devel-bgpd_bgpd.8
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 3b0fdc448718..c01c2911b64d 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME?=	openbgpd
-PORTVERSION?=	3.7
-PORTREVISION?=	3
+PORTVERSION?=	3.9
+PORTREVISION?=	0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenBGPD/:openbsd \
 		${MASTER_SITE_LOCAL:S/$/:freebsd/g}
 MASTER_SITE_SUBDIR=	flz/openbgpd/:freebsd
 DISTFILES?=	${PORTNAME}-${PORTVERSION}.tgz:openbsd,freebsd
-DISTFILES+=	if_media.h:freebsd pfkey_compat.c:freebsd
+DISTFILES+=	if_media.h:freebsd pfkey_compat.c:freebsd \
+		hash.h:freebsd strtonum.c:freebsd
 DIST_SUBDIR=	openbgpd
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
@@ -27,6 +28,7 @@ MANCOMPRESSED=	yes
 USE_RC_SUBR=	openbgpd.sh
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
+COPTS+=		-DRTA_LABEL=0
 
 EXTRA_PATCHES?=	${.CURDIR}/files/stable-bgpd_bgpd.8
 
@@ -49,10 +51,8 @@ IGNORE=		requires macros present in <sys/tree.h>
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/bgpctl/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pfkey_compat.c ${WRKSRC}/bgpd/
-.if ${.CURDIR:M*openbgpd-devel} != ""
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/hash.h ${WRKSRC}/bgpd/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/strtonum.c ${WRKSRC}/bgpctl/
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	\
diff --git a/net/openbgpd/distinfo b/net/openbgpd/distinfo
index 0db8e983c4c6..ca4d04577afd 100644
--- a/net/openbgpd/distinfo
+++ b/net/openbgpd/distinfo
@@ -1,9 +1,15 @@
-MD5 (openbgpd/openbgpd-3.7.tgz) = 4d9d933a705a9b4154a86344e6eae437
-SHA256 (openbgpd/openbgpd-3.7.tgz) = 5976742495ecfcea7446a9a91265656154f0be0492cfe3e976c514e4f9df1616
-SIZE (openbgpd/openbgpd-3.7.tgz) = 114980
+MD5 (openbgpd/openbgpd-3.9.tgz) = 818f0e1725f7804e2ef5f7e5d2da9029
+SHA256 (openbgpd/openbgpd-3.9.tgz) = 041bb2e56dd94db8e755df0825467c0f068bb3abe8e3b613b77aede13cc3fc33
+SIZE (openbgpd/openbgpd-3.9.tgz) = 134112
 MD5 (openbgpd/if_media.h) = 4ff9297f5c133425dafe3ca565c0f811
 SHA256 (openbgpd/if_media.h) = 58225d0ed363c2beb23426f0f8254089d4541c3334776f3750ba434d4491a1d1
 SIZE (openbgpd/if_media.h) = 23762
 MD5 (openbgpd/pfkey_compat.c) = 8c3bdf02fd308b327bd30e09674c1858
 SHA256 (openbgpd/pfkey_compat.c) = 46f559c945552ec11174d218c24eeacb3d0bc1dc010a80f07af525b751df1180
 SIZE (openbgpd/pfkey_compat.c) = 360
+MD5 (openbgpd/hash.h) = 0c397692b9b152f1bca968b6248bc09c
+SHA256 (openbgpd/hash.h) = 0c5561c6765325f49d82d5c5fd9471dbfadf21f44e554758eb112a23f7c317b1
+SIZE (openbgpd/hash.h) = 3488
+MD5 (openbgpd/strtonum.c) = da3ba14723ae645c13b8ea96d3f78f20
+SHA256 (openbgpd/strtonum.c) = eabeece529ed7678b5d79774813818ed1d46b7c7a934c98e474c8f62c56abaec
+SIZE (openbgpd/strtonum.c) = 1769
diff --git a/net/openbgpd-devel/files/devel-bgpctl_bgpctl.c b/net/openbgpd/files/patch-bgpctl_bgpctl.c
index 308e4fc8bdf1..308e4fc8bdf1 100644
--- a/net/openbgpd-devel/files/devel-bgpctl_bgpctl.c
+++ b/net/openbgpd/files/patch-bgpctl_bgpctl.c
diff --git a/net/openbgpd-devel/files/devel-bgpctl_parser.c b/net/openbgpd/files/patch-bgpctl_parser.c
index 1257dc8f4e13..1257dc8f4e13 100644
--- a/net/openbgpd-devel/files/devel-bgpctl_parser.c
+++ b/net/openbgpd/files/patch-bgpctl_parser.c
diff --git a/net/openbgpd-devel/files/devel-bgpd_kroute.c b/net/openbgpd/files/patch-bgpd_kroute.c
index 1084c2c59aa0..1084c2c59aa0 100644
--- a/net/openbgpd-devel/files/devel-bgpd_kroute.c
+++ b/net/openbgpd/files/patch-bgpd_kroute.c