===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/net/quagga.orig/Makefile /usr/ports/net/quagga/Makefile --- /usr/ports/net/quagga.orig/Makefile 2010-08-25 09:38:52.000000000 +0600 +++ /usr/ports/net/quagga/Makefile 2010-08-25 10:14:56.000000000 +0600 @@ -6,8 +6,7 @@ # PORTNAME= quagga -PORTVERSION= 0.99.16 -PORTREVISION= 1 +PORTVERSION= 0.99.17 CATEGORIES= net ipv6 MASTER_SITES= http://quagga.net/download/ \ http://www.ru.quagga.net/download/ \ @@ -23,7 +22,7 @@ CONFLICTS= openbgpd-[0-9]* zebra-0* -USE_AUTOTOOLS= libtool:22 +USE_AUTOTOOLS= libtool:22 autoheader:262 USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5_BUILD= yes diff -ruN --exclude=CVS /usr/ports/net/quagga.orig/distinfo /usr/ports/net/quagga/distinfo --- /usr/ports/net/quagga.orig/distinfo 2010-08-25 09:38:56.000000000 +0600 +++ /usr/ports/net/quagga/distinfo 2010-08-25 09:39:32.000000000 +0600 @@ -1,3 +1,3 @@ -MD5 (quagga-0.99.16.tar.gz) = 350fb150be526cdfc4d2b093cb4d69a7 -SHA256 (quagga-0.99.16.tar.gz) = 840e376bf42a3c5ee1069eedddb195749b1ebadeef6cacd9fee24ed6f44c35c5 -SIZE (quagga-0.99.16.tar.gz) = 2168417 +MD5 (quagga-0.99.17.tar.gz) = 37b9022adca04b03863d2d79787e643f +SHA256 (quagga-0.99.17.tar.gz) = 1d77df121a334e9504b45e489ee7ce35bf478e27d33cd2793a23280b59d9efd4 +SIZE (quagga-0.99.17.tar.gz) = 2202151 diff -ruN --exclude=CVS /usr/ports/net/quagga.orig/files/patch-configure /usr/ports/net/quagga/files/patch-configure --- /usr/ports/net/quagga.orig/files/patch-configure 2010-06-20 03:35:51.000000000 +0600 +++ /usr/ports/net/quagga/files/patch-configure 1970-01-01 05:00:00.000000000 +0500 @@ -1,10 +0,0 @@ ---- configure.orig 2010-06-19 15:58:32.000000000 +0600 -+++ configure 2010-06-19 15:58:44.000000000 +0600 -@@ -25085,6 +25085,7 @@ - #if HAVE_NETINET_IP_ICMP_H - # include - #endif -+#include - - " - if test "x$ac_cv_header_security_openpam_h" = x""yes; then : diff -ruN --exclude=CVS /usr/ports/net/quagga.orig/files/patch-configure.ac /usr/ports/net/quagga/files/patch-configure.ac --- /usr/ports/net/quagga.orig/files/patch-configure.ac 1970-01-01 05:00:00.000000000 +0500 +++ /usr/ports/net/quagga/files/patch-configure.ac 2010-08-25 10:03:29.000000000 +0600 @@ -0,0 +1,65 @@ +--- configure.ac.orig 2010-08-19 15:36:29.000000000 +0600 ++++ configure.ac 2010-08-25 10:03:15.000000000 +0600 +@@ -443,25 +443,14 @@ + #endif /* TIME_WITH_SYS_TIME */ + ])dnl + +-AC_CHECK_HEADERS([sys/un.h net/if.h netinet/in_systm.h netinet/in_var.h \ +- net/if_dl.h net/if_var.h net/netopt.h net/route.h \ +- inet/nd.h arpa/inet.h netinet/ip_icmp.h \ +- fcntl.h stddef.h sys/ioctl.h syslog.h wchar.h wctype.h \ +- sys/sysctl.h sys/sockio.h kvm.h sys/conf.h], +- [], [], QUAGGA_INCLUDES) +- +-AC_CHECK_HEADERS([ucontext.h], [], [], +-[#ifndef __USE_GNU +-#define __USE_GNU +-#endif /* __USE_GNU */ +-QUAGGA_INCLUDES +-]) +- + m4_define([QUAGGA_INCLUDES], + QUAGGA_INCLUDES + [#if HAVE_NET_IF_H + # include + #endif ++#if HAVE_NET_IF_VAR_H ++# include ++#endif + #if HAVE_SYS_UN_H + # include + #endif +@@ -474,9 +463,6 @@ + #if HAVE_NET_IF_DL_H + # include + #endif +-#if HAVE_NET_IF_VAR_H +-# include +-#endif + #if HAVE_NET_NETOPT_H + # include + #endif +@@ -493,8 +479,23 @@ + #if HAVE_NETINET_IP_ICMP_H + # include + #endif ++#include + ])dnl + ++AC_CHECK_HEADERS([sys/un.h net/if.h net/if_var.h net/if_dl.h \ ++ netinet/in_systm.h netinet/in_var.h net/netopt.h net/route.h \ ++ inet/nd.h arpa/inet.h netinet/ip_icmp.h \ ++ fcntl.h stddef.h sys/ioctl.h syslog.h wchar.h wctype.h \ ++ sys/sysctl.h sys/sockio.h kvm.h sys/conf.h], ++ [], [], QUAGGA_INCLUDES) ++ ++AC_CHECK_HEADERS([ucontext.h], [], [], ++[#ifndef __USE_GNU ++#define __USE_GNU ++#endif /* __USE_GNU */ ++QUAGGA_INCLUDES ++]) ++ + dnl V6 headers are checked below, after we check for v6 + + dnl Some systems (Solaris 2.x) require libnsl (Network Services Library) diff -ruN --exclude=CVS /usr/ports/net/quagga.orig/files/patch-lib-sockopt.c /usr/ports/net/quagga/files/patch-lib-sockopt.c --- /usr/ports/net/quagga.orig/files/patch-lib-sockopt.c 1970-01-01 05:00:00.000000000 +0500 +++ /usr/ports/net/quagga/files/patch-lib-sockopt.c 2010-06-30 09:54:23.000000000 +0600 @@ -0,0 +1,16 @@ + +--- lib/sockopt.c.orig 2008-01-11 16:47:21.000000000 +0300 ++++ lib/sockopt.c 2008-01-11 16:47:57.000000000 +0300 +@@ -23,6 +23,10 @@ + #include "log.h" + #include "sockopt.h" + ++#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX ++#undef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX ++#endif ++ + int + setsockopt_so_recvbuf (int sock, int size) + { + + ===> Done