- Update openbgpd-devel to today's snapshot (20060516).

5 files changed, 44 insertions, 10 deletions

diff --git a/net/openbgpd-devel/Makefile b/net/openbgpd-devel/Makefile
index ab8c16ab0609..021d54045a92 100644
--- a/net/openbgpd-devel/Makefile
+++ b/net/openbgpd-devel/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	net
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:freebsd \
 		hash.h:freebsd strtonum.c:freebsd
-SNAPSHOT=	20060320
+SNAPSHOT=	20060516
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
@@ -21,7 +21,8 @@ CONFLICTS=	zebra-0* quagga-0* openbgpd-devel-*
 MASTERDIR=	${.CURDIR}/../openbgpd
 MD5_FILE=	${.CURDIR}/distinfo
 
-EXTRA_PATCHES=	${.CURDIR}/files/devel-bgpd_kroute.c \
+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
 
diff --git a/net/openbgpd-devel/distinfo b/net/openbgpd-devel/distinfo
index 86a7ccd20a8e..ae0b2d6187b8 100644
--- a/net/openbgpd-devel/distinfo
+++ b/net/openbgpd-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openbgpd/openbgpd-devel-20060320.tgz) = 2f532bcb074ca5e722a5f757b07eaf13
-SHA256 (openbgpd/openbgpd-devel-20060320.tgz) = b9133bb802277b662da8c3dabd833759fb8cd22da47e9e3f3dc72f5090f95335
-SIZE (openbgpd/openbgpd-devel-20060320.tgz) = 134445
+MD5 (openbgpd/openbgpd-devel-20060516.tgz) = ddb15fe817c6525575658107d41b2724
+SHA256 (openbgpd/openbgpd-devel-20060516.tgz) = 664a5952c7d8961f126663e4876d24d40d496a4d8fca608cbc65e0dd774403ba
+SIZE (openbgpd/openbgpd-devel-20060516.tgz) = 136149
 MD5 (openbgpd/hash.h) = 0c397692b9b152f1bca968b6248bc09c
 SHA256 (openbgpd/hash.h) = 0c5561c6765325f49d82d5c5fd9471dbfadf21f44e554758eb112a23f7c317b1
 SIZE (openbgpd/hash.h) = 3488
diff --git a/net/openbgpd-devel/files/devel-bgpd_bgpd.8 b/net/openbgpd-devel/files/devel-bgpd_bgpd.8
new file mode 100644
index 000000000000..e3892cbf04d5
--- /dev/null
+++ b/net/openbgpd-devel/files/devel-bgpd_bgpd.8
@@ -0,0 +1,32 @@
+--- bgpd/bgpd.8.orig	Tue May 16 17:14:46 2006
++++ bgpd/bgpd.8	Tue May 16 17:16:27 2006
+@@ -48,9 +48,9 @@
+ .Nm
+ is usually started at boot time, and can be enabled by
+ setting the following in
+-.Pa /etc/rc.conf.local :
++.Pa /etc/rc.conf :
+ .Pp
+-.Dl bgpd_flags=\&"\&"
++.Dl openbgpd_flags=\&"\&"
+ .Pp
+ See
+ .Xr rc 8
+@@ -92,7 +92,7 @@
+ .Ar file
+ as the configuration file,
+ instead of the default
+-.Pa /etc/bgpd.conf .
++.Pa %%PREFIX%%/etc/bgpd.conf .
+ .It Fl n
+ Configtest mode.
+ Only check the configuration file for validity.
+@@ -110,7 +110,7 @@
+ .El
+ .Sh FILES
+ .Bl -tag -width "/var/run/bgpd.sockXXX" -compact
+-.It Pa /etc/bgpd.conf
++.It Pa %%PREFIX%%/etc/bgpd.conf
+ default
+ .Nm
+ configuration file
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index e85f3b345e57..64ec2c61b000 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -28,6 +28,8 @@ USE_RC_SUBR=	openbgpd.sh
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
 
+EXTRA_PATCHES?=	${.CURDIR}/stable-bgpd_bgpd.8
+
 PLIST_FILES=	sbin/bgpctl	\
 		sbin/bgpd
 
@@ -60,8 +62,10 @@ post-patch:
 		${WRKSRC}/bgpd/bgpd.conf.5		\
 		${WRKSRC}/bgpctl/Makefile		\
 		${WRKSRC}/bgpctl/bgpctl.8
-	@${REINPLACE_CMD} -e "s|__dead ||"		\
-		${WRKSRC}/bgpd/bgpd.c ${WRKSRC}/bgpctl/bgpctl.c
+	@${REINPLACE_CMD} -e "s|__dead||"		\
+		${WRKSRC}/bgpd/bgpd.c 		\
+		${WRKSRC}/bgpd/bgpd.h 		\
+		${WRKSRC}/bgpctl/bgpctl.c
 	@${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/bgpd/*.[chy]
 	@${REINPLACE_CMD} -e "s|<net/if_media.h>|\"if_media.h\"|" ${WRKSRC}/bgpctl/bgpctl.c
 	@${REINPLACE_CMD} -e "s|pfkey.c|pfkey_compat.c|" ${WRKSRC}/bgpd/Makefile
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.8 b/net/openbgpd/files/stable-bgpd_bgpd.8
index 5810275fa85e..47e9f256bd7e 100644
--- a/net/openbgpd/files/patch-bgpd_bgpd.8
+++ b/net/openbgpd/files/stable-bgpd_bgpd.8
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- bgpd/bgpd.8.orig
 +++ bgpd/bgpd.8
 @@ -46,9 +46,9 @@