Index: head/net/zebra/Makefile
===================================================================
--- head/net/zebra/Makefile	(revision 514388)
+++ head/net/zebra/Makefile	(revision 514389)
@@ -1,91 +1,91 @@
 # Created by: Andreas Klemm <andreas@klemm.gtn.com>
 # $FreeBSD$
 
 PORTNAME=	zebra
 PORTVERSION=	0.95a
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/ \
 		ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \
 		http://ftp.sunet.se/pub/network/zebra/
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 CONFLICTS=	openbgpd-[0-9]* quagga-[0-9]* quagga-re-[0-9]* openospfd-[0-9]*
 
 SUB_FILES=	pkg-message zebractl
 SUB_LIST=	BGPDARGS=${BGPDARGS} \
 		OSPFDARGS=${OSPFDARGS} \
 		OSPF6DARGS=${OSPFDARGS} \
 		RIPDARGS=${RIPDARGS} \
 		RIPNGDARGS=${RIPNGDARGS} \
 		ZEBRAARGS=${ZEBRAARGS}
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 USES=		cpe readline
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/zebra
 CPE_VENDOR=	gnu
 
 PORTSCOUT=	ignore:1
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
 
 OPTIONS_DEFINE=	IPV6 PAM OSPFNSSA SNMP TCPZEBRA BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
 
 PAM_DESC=	PAM authentication for vtysh
 OSPFNSSA_DESC=	undergoing NSSA feature
 TCPZEBRA_DESC=	TCP/IP socket connection
 BGPD_DESC=	BGPD support
 OSPF6D_DESC=	OSPF6D support
 OSPFD_DESC=	OSPFD support
 RIPD_DESC=	RIPD support
 RIPNGD_DESC=	RIPNGD support
 VTYSH_DESC=	VTYSH support
 
 OPTIONS_DEFAULT=	BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
 OPTIONS_SUB=	yes
 NO_OPTIONS_SORT=	yes
 
 PAM_CONFIGURE_WITH=		pam
 OSPFNSSA_CONFIGURE_ENABLE=	nssa
 SNMP_CONFIGURE_ENABLE=		snmp
 SNMP_LIB_DEPENDS+=		libnetsnmp.so:net-mgmt/net-snmp
 TCPZEBRA_CONFIGURE_ENABLE=	tcp-zebra
 BGPD_CONFIGURE_ENABLE=		bgpd
 OSPF6D_CONFIGURE_ENABLE=	ospf6d
 OSPFD_CONFIGURE_ENABLE=		ospfd
 RIPD_CONFIGURE_ENABLE=		ripd
 RIPNGD_CONFIGURE_ENABLE=	ripngd
 VTYSH_CONFIGURE_ENABLE=		vtysh
 IPV6_CONFIGURE_ENABLE=		ipv6
 
 INFO=		zebra
 
 BGPDARGS?=	-d
 OSPFDARGS?=	-d
 OSPF6DARGS?=	-d
 RIPDARGS?=	-d
 RIPNGDARGS?=	-d
 ZEBRAARGS?=	-d
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MOSPF6D}
 IGNORE=		OSPF6D requires IPV6 option
 .endif
 .if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MRIPNGD}
 IGNORE=		RIPNGD requires IPV6 option
 .endif
 
 post-install:
 	@( cd ${WRKSRC}/doc; ${RM} zebra*info*; \
 	   ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} zebra.info install )
 	@${ECHO_MSG} "===>     installing zebra startup file..."
 	${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl
 	@${ECHO_MSG} "done."
 
 .include <bsd.port.mk>
Index: head/net/zebra/files/patch-ospfd_ospf_dump.c
===================================================================
--- head/net/zebra/files/patch-ospfd_ospf_dump.c	(revision 514388)
+++ head/net/zebra/files/patch-ospfd_ospf_dump.c	(revision 514389)
@@ -1,11 +1,11 @@
 --- ospfd/ospf_dump.c.orig	2003-11-04 20:10:17.000000000 +0100
 +++ ospfd/ospf_dump.c	2014-03-18 14:22:06.123332679 +0100
 @@ -607,7 +607,7 @@
  
    iph = (struct ip *) STREAM_PNT (s);
  
 -#ifdef GNU_LINUX
-+#ifdef GNU_LINUX || ((defined(__FreeBSD__) && (__FreeBSD_version >= 1100030))
++#if defined(GNU_LINUX) || defined(__FreeBSD__)
    length = ntohs (iph->ip_len);
  #else /* GNU_LINUX */
    length = iph->ip_len;
Index: head/net/zebra/files/patch-ospfd_ospf_packet.c
===================================================================
--- head/net/zebra/files/patch-ospfd_ospf_packet.c	(revision 514388)
+++ head/net/zebra/files/patch-ospfd_ospf_packet.c	(revision 514389)
@@ -1,30 +1,27 @@
 --- ospfd/ospf_packet.c.orig	2005-06-21 02:58:24.000000000 +0200
 +++ ospfd/ospf_packet.c	2014-03-18 14:22:06.129332906 +0100
-@@ -528,7 +528,8 @@
+@@ -528,7 +528,7 @@
    iph.ip_hl = sizeof (struct ip) >> 2;
    iph.ip_v = IPVERSION;
    iph.ip_tos = IPTOS_PREC_INTERNETCONTROL;
 -#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) \
-+ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030))
++#if defined(__NetBSD__)
    iph.ip_len = iph.ip_hl*4 + op->length;
  #else
    iph.ip_len = htons (iph.ip_hl*4 + op->length);
-@@ -1893,13 +1894,15 @@
+@@ -1893,13 +1894,13 @@
        return NULL;
      }
  
 -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD_IP_LEN)
-+#if defined(__NetBSD__) \
-+ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
-+ || defined(OpenBSD_IP_LEN)
++#if defined(__NetBSD__) || defined(OpenBSD_IP_LEN)
    ip_len = iph.ip_len;
  #else
    ip_len = ntohs (iph.ip_len);
  #endif
  
 -#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN)
-+#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && (__FreeBSD_version < 1000000)
++#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && !defined(__FreeBSD__)
    /*
     * Kernel network code touches incoming IP header parameters,
     * before protocol specific processing.