Thu Mar 1 00:48:04 2018 UTC ()
quagga: correct mistake in configure check.
this made the configure test always fail and broke the build on netbsd.

Fixes PR pkg/53050.

PKGREVISION++


(maya)
diff -r1.57 -r1.58 pkgsrc/net/quagga/Makefile
diff -r1.29 -r1.30 pkgsrc/net/quagga/distinfo
diff -r1.6 -r1.7 pkgsrc/net/quagga/patches/patch-configure
cvs diff -r1.57 -r1.58 pkgsrc/net/quagga/Makefile (expand / switch to unified diff)

--- pkgsrc/net/quagga/Makefile 2018/01/22 13:42:06 1.57
+++ pkgsrc/net/quagga/Makefile 2018/03/01 00:48:04 1.58
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.57 2018/01/22 13:42:06 wiedi Exp $ 1# $NetBSD: Makefile,v 1.58 2018/03/01 00:48:04 maya Exp $
2# 2#
3 3
4DISTNAME= quagga-1.2.2 4DISTNAME= quagga-1.2.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/ 7MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://www.nongnu.org/quagga/ 10HOMEPAGE= http://www.nongnu.org/quagga/
11COMMENT= Free multithreaded routing daemon software 11COMMENT= Free multithreaded routing daemon software
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_TOOLS+= gawk gmake perl 17USE_TOOLS+= gawk gmake perl
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
cvs diff -r1.29 -r1.30 pkgsrc/net/quagga/distinfo (expand / switch to unified diff)

--- pkgsrc/net/quagga/distinfo 2018/01/22 13:42:06 1.29
+++ pkgsrc/net/quagga/distinfo 2018/03/01 00:48:04 1.30
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.29 2018/01/22 13:42:06 wiedi Exp $ 1$NetBSD: distinfo,v 1.30 2018/03/01 00:48:04 maya Exp $
2 2
3SHA1 (quagga-1.2.2.tar.gz) = d2601270a39e707db88d0c39b81acb13b53e0568 3SHA1 (quagga-1.2.2.tar.gz) = d2601270a39e707db88d0c39b81acb13b53e0568
4RMD160 (quagga-1.2.2.tar.gz) = daa24bc37661eb5436edf42a15ed4ae1bc1b56ef 4RMD160 (quagga-1.2.2.tar.gz) = daa24bc37661eb5436edf42a15ed4ae1bc1b56ef
5SHA512 (quagga-1.2.2.tar.gz) = 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14 5SHA512 (quagga-1.2.2.tar.gz) = 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
6Size (quagga-1.2.2.tar.gz) = 2986142 bytes 6Size (quagga-1.2.2.tar.gz) = 2986142 bytes
7SHA1 (patch-configure) = 310295eeed487ccadbd7f56ae71dbb7cf0c71919 7SHA1 (patch-configure) = d3289b94f9aa871678398ccd78f655944277f03f
8SHA1 (patch-solaris_quagga.init.in) = 47569aaffe2713809e21ebbb76164cf50b7f983f 8SHA1 (patch-solaris_quagga.init.in) = 47569aaffe2713809e21ebbb76164cf50b7f983f
9SHA1 (patch-zebra_kernel__socket.c) = 82c1be406ec587d7bc4d6eec39f9daebbc34e999 9SHA1 (patch-zebra_kernel__socket.c) = 82c1be406ec587d7bc4d6eec39f9daebbc34e999
cvs diff -r1.6 -r1.7 pkgsrc/net/quagga/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/quagga/patches/patch-configure 2018/01/22 13:42:07 1.6
+++ pkgsrc/net/quagga/patches/patch-configure 2018/03/01 00:48:04 1.7
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-configure,v 1.6 2018/01/22 13:42:07 wiedi Exp $ 1$NetBSD: patch-configure,v 1.7 2018/03/01 00:48:04 maya Exp $
2HAVE_BSD_STRUCT_IP_MREQ_HACK does not work on SunOS 2HAVE_BSD_STRUCT_IP_MREQ_HACK does not work on SunOS
3Results in: can't setsockopt IP_MULTICAST_IF(...): No route to host 3Results in: can't setsockopt IP_MULTICAST_IF(...): No route to host
4 4
5--- configure.orig 2017-10-03 14:59:10.000000000 +0000 5--- configure.orig 2017-10-03 14:59:10.000000000 +0000
6+++ configure 6+++ configure
7@@ -20631,7 +20631,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ 7@@ -20631,7 +20631,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
8 int 8 int
9 main () 9 main ()
10 { 10 {
11-#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__sun) 11-#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__sun)
12+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)) 12+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
13 return (0); 13 return (0);
14 #else 14 #else
15 #error No support for BSD struct ip_mreq hack detected 15 #error No support for BSD struct ip_mreq hack detected