Index: head/net/bird/Makefile =================================================================== --- head/net/bird/Makefile (revision 432478) +++ head/net/bird/Makefile (revision 432479) @@ -1,46 +1,47 @@ # Created by: Pav Lucistnik # $FreeBSD$ PORTNAME?= bird PORTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ \ http://bird.mpls.in/distfiles/bird/ MAINTAINER= melifaro@ipfw.ru COMMENT?= Dynamic IP routing daemon (IPv4 version) LICENSE= GPLv2 USES= bison gmake ncurses readline GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=/var OPTIONS_DEFINE?= FIREWALL FIREWALL_DESC= Enable firewall protocol NO_OPTIONS_SORT= yes MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= ${PORTNAME} SUB_LIST+= PORTNAME=${PORTNAME} PLIST_SUB?= VER="" FIREWALL_EXTRA_PATCHES+= ${FILESDIR}/firewall_support.patch .include post-patch: .if ${PORT_OPTIONS:MFIREWALL} @${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 firewall"/' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/ proto_build(\&proto_firewall);/;}' ${WRKSRC}/nest/proto.c @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPSET/;}' ${WRKSRC}/sysdep/autoconf.h.in @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_PF/;}' ${WRKSRC}/sysdep/autoconf.h.in @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPFW/;}' ${WRKSRC}/sysdep/autoconf.h.in @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL/;}' ${WRKSRC}/sysdep/autoconf.h.in @${REINPLACE_CMD} -e 's/\(proto_bfd\)/\1, proto_firewall/' ${WRKSRC}/nest/protocol.h .endif .include Index: head/net/bird/files/sysdep-bsd-sysio.h =================================================================== --- head/net/bird/files/sysdep-bsd-sysio.h (revision 432478) +++ head/net/bird/files/sysdep-bsd-sysio.h (nonexistent) @@ -1,23 +0,0 @@ -diff --git sysdep/bsd/sysio.h sysdep/bsd/sysio.h -index 2610a47..9b10e6e 100644 ---- sysdep/bsd/sysio.h -+++ sysdep/bsd/sysio.h -@@ -9,6 +9,7 @@ - #include - #include // Workaround for some BSDs - #include -+#include - - - #ifdef __NetBSD__ -@@ -179,8 +180,8 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen) - ip->ip_src = ipa_to_in4(s->saddr); - ip->ip_dst = ipa_to_in4(s->daddr); - --#ifdef __OpenBSD__ -- /* OpenBSD expects ip_len in network order, other BSDs expect host order */ -+#if (defined __OpenBSD__) || (defined __DragonFly__) || (defined __FreeBSD__ && (__FreeBSD_version >= 1100030)) -+ /* Different BSDs have different expectations of ip_len endianity */ - ip->ip_len = htons(ip->ip_len); - #endif - } Property changes on: head/net/bird/files/sysdep-bsd-sysio.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/bird/files/patch-sysdep-bsd-sysio.h =================================================================== --- head/net/bird/files/patch-sysdep-bsd-sysio.h (nonexistent) +++ head/net/bird/files/patch-sysdep-bsd-sysio.h (revision 432479) @@ -0,0 +1,23 @@ +diff --git sysdep/bsd/sysio.h sysdep/bsd/sysio.h +index 2610a47..9b10e6e 100644 +--- sysdep/bsd/sysio.h ++++ sysdep/bsd/sysio.h +@@ -9,6 +9,7 @@ + #include + #include // Workaround for some BSDs + #include ++#include + + + #ifdef __NetBSD__ +@@ -179,8 +180,8 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen) + ip->ip_src = ipa_to_in4(s->saddr); + ip->ip_dst = ipa_to_in4(s->daddr); + +-#ifdef __OpenBSD__ +- /* OpenBSD expects ip_len in network order, other BSDs expect host order */ ++#if (defined __OpenBSD__) || (defined __DragonFly__) || (defined __FreeBSD__ && (__FreeBSD_version >= 1100030)) ++ /* Different BSDs have different expectations of ip_len endianity */ + ip->ip_len = htons(ip->ip_len); + #endif + } Property changes on: head/net/bird/files/patch-sysdep-bsd-sysio.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property