5 files changed, 99 insertions, 18 deletions

diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 78635b4e2ad5..ba405987ffed 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -5,26 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openospfd-devel
-PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	2
+PORTNAME=	openospfd
+PORTVERSION=	4.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenOSPFD/:openbsd \
+MASTER_SITES=	ftp://ftp.dkuug.dk/pub/OpenBSD/OpenBGPD/:openbsd \
 		${MASTER_SITE_LOCAL:S/$/:freebsd/g}
 MASTER_SITE_SUBDIR=	flz/openospfd/:freebsd
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:freebsd \
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:openbsd \
 		if_media.h:freebsd hash.h:freebsd
-DIST_SUBDIR=	openospfd
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
-MAINTAINER=	flz@FreeBSD.org
+MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Free implementation of the Open Shortest Path First Protocol
 
 LIB_DEPENDS=	event-1.3b:${PORTSDIR}/devel/libevent
 
 CONFLICTS=	zebra-0* quagga-0*
 
-SNAPSHOT=	20060516
 WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
 USE_RC_SUBR=	openospfd.sh
@@ -43,12 +41,6 @@ MAN8=		ospfctl.8	\
 SUBDIRS=	ospfd \
 		ospfctl
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500037
-IGNORE=		requires macros present in <sys/tree.h>
-.endif
-
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/ospfctl/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/hash.h ${WRKSRC}/ospfd/
@@ -58,6 +50,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|<net/if_media.h>|\"if_media.h\"|" ${WRKSRC}/ospfctl/ospfctl.c
 	@${REINPLACE_CMD} -e "s|rtm_fmask|rtm_use|" ${WRKSRC}/ospfd/kroute.c
 	@${REINPLACE_CMD} -e "/rc.conf.local/d" ${WRKSRC}/ospfd/ospfd.conf.5
+	@${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/ospfd/*.[chy]
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \
 		${WRKSRC}/ospfd/ospfd.h \
 		${WRKSRC}/ospfd/ospfd.8 \
@@ -80,4 +73,4 @@ do-install:
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/openospfd/distinfo b/net/openospfd/distinfo
index d89dffdb83ce..84810c858037 100644
--- a/net/openospfd/distinfo
+++ b/net/openospfd/distinfo
@@ -1,6 +1,6 @@
-MD5 (openospfd/openospfd-devel-20060516.tgz) = 93fdd6650a14d316e374e8a17aeedcdc
-SHA256 (openospfd/openospfd-devel-20060516.tgz) = 0498bcecc2e592a695bdf7696e473796d9d320f6c66211802fdb0a45a04b7662
-SIZE (openospfd/openospfd-devel-20060516.tgz) = 80381
+MD5 (openospfd/openospfd-4.0.tgz) = 6dcf9170627120f009ff9d5917b49376
+SHA256 (openospfd/openospfd-4.0.tgz) = c9e87e849664a6674a4a650a453754b53d6c0bd1110ee5e82a7b6cc7fbad6ee7
+SIZE (openospfd/openospfd-4.0.tgz) = 84459
 MD5 (openospfd/if_media.h) = 4ff9297f5c133425dafe3ca565c0f811
 SHA256 (openospfd/if_media.h) = 58225d0ed363c2beb23426f0f8254089d4541c3334776f3750ba434d4491a1d1
 SIZE (openospfd/if_media.h) = 23762
diff --git a/net/openospfd/files/patch-ospfctl_parser.c b/net/openospfd/files/patch-ospfctl_parser.c
new file mode 100644
index 000000000000..c4f7fc886d01
--- /dev/null
+++ b/net/openospfd/files/patch-ospfctl_parser.c
@@ -0,0 +1,26 @@
+--- ospfctl/parser.c.orig	Fri Jul 27 15:11:46 2007
++++ ospfctl/parser.c	Fri Jul 27 15:12:01 2007
+@@ -32,23 +32,6 @@
+ 
+ #include "parser.h"
+ 
+-enum token_type {
+-	NOTOKEN,
+-	ENDTOKEN,
+-	KEYWORD,
+-	ADDRESS,
+-	FLAG,
+-	PREFIX,
+-	IFNAME
+-};
+-
+-struct token {
+-	enum token_type		 type;
+-	const char		*keyword;
+-	int			 value;
+-	const struct token	*next;
+-};
+-
+ static const struct token t_main[];
+ static const struct token t_fib[];
+ static const struct token t_show[];
diff --git a/net/openospfd/files/patch-ospfctl_parser.h b/net/openospfd/files/patch-ospfctl_parser.h
new file mode 100644
index 000000000000..b4eab4960d00
--- /dev/null
+++ b/net/openospfd/files/patch-ospfctl_parser.h
@@ -0,0 +1,26 @@
+--- ospfctl/parser.h.orig	Fri Jul 27 15:11:55 2007
++++ ospfctl/parser.h	Fri Jul 27 15:12:01 2007
+@@ -50,6 +50,23 @@
+ 	RELOAD
+ };
+ 
++enum token_type {
++	NOTOKEN,
++	ENDTOKEN,
++	KEYWORD,
++	ADDRESS,
++	FLAG,
++	PREFIX,
++	IFNAME
++};
++
++struct token {
++	enum token_type		 type;
++	const char		*keyword;
++	int			 value;
++	const struct token	*next;
++};
++
+ struct parse_result {
+ 	struct in_addr	addr;
+ 	char		ifname[IF_NAMESIZE];
diff --git a/net/openospfd/files/patch-ospfd_kroute.c b/net/openospfd/files/patch-ospfd_kroute.c
new file mode 100644
index 000000000000..6415a3b80316
--- /dev/null
+++ b/net/openospfd/files/patch-ospfd_kroute.c
@@ -0,0 +1,36 @@
+--- ospfd/kroute.c.orig	Mon Nov 20 14:41:22 2006
++++ ospfd/kroute.c	Mon Nov 20 14:42:17 2006
+@@ -875,10 +875,6 @@
+ 			send_rtmsg(kr_state.fd, RTM_DELETE, &kr->r);
+ 			free(kr);
+ 		} else {
+-			if ((label = (struct sockaddr_rtlabel *)
+-			    rti_info[RTAX_LABEL]) != NULL)
+-				kr->r.rtlabel =
+-				    rtlabel_name2id(label->sr_label);
+ 			kroute_insert(kr);
+ 		}
+ 
+@@ -1075,10 +1071,6 @@
+ 
+ 				rtlabel_unref(kr->r.rtlabel);
+ 				kr->r.rtlabel = 0;
+-				if ((label = (struct sockaddr_rtlabel *)
+-				    rti_info[RTAX_LABEL]) != NULL)
+-					kr->r.rtlabel =
+-					    rtlabel_name2id(label->sr_label);
+ 
+ 				if (kif_validate(kr->r.ifindex))
+ 					kr->r.flags &= ~F_DOWN;
+@@ -1098,11 +1090,6 @@
+ 				kr->r.nexthop.s_addr = nexthop.s_addr;
+ 				kr->r.flags = flags;
+ 				kr->r.ifindex = ifindex;
+-
+-				if ((label = (struct sockaddr_rtlabel *)
+-				    rti_info[RTAX_LABEL]) != NULL)
+-					kr->r.rtlabel =
+-					    rtlabel_name2id(label->sr_label);
+ 
+ 				kroute_insert(kr);
+ 			}