Fri Jan 22 18:33:17 2021 UTC ()
Pullup ticket #6410 - requested by kardel
net/frr: build fix

Revisions pulled up:
- net/frr/Makefile                                              1.3-1.4

---
   Module Name:    pkgsrc
   Committed By:   kardel
   Date:           Wed Jan  6 10:45:49 UTC 2021

   Modified Files:
           pkgsrc/net/frr: Makefile

   Log Message:
   net/frr: document bison tool dependency

---
   Module Name:    pkgsrc
   Committed By:   kardel
   Date:           Wed Jan  6 11:53:52 UTC 2021

   Modified Files:
           pkgsrc/net/frr: Makefile

   Log Message:
   net/frr: simplify bison tool requirement


(bsiegert)
diff -r1.1 -r1.1.2.1 pkgsrc/net/frr/Makefile
cvs diff -r1.1 -r1.1.2.1 pkgsrc/net/frr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/frr/Makefile 2020/12/10 16:43:24 1.1
+++ pkgsrc/net/frr/Makefile 2021/01/22 18:33:17 1.1.2.1
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.1 2020/12/10 16:43:24 kardel Exp $ 1# $NetBSD: Makefile,v 1.1.2.1 2021/01/22 18:33:17 bsiegert Exp $
2 2
3GITHUB_PROJECT= frr 3GITHUB_PROJECT= frr
4VERSION= 7.5 4VERSION= 7.5
5GITHUB_TAG= frr-${VERSION} 5GITHUB_TAG= frr-${VERSION}
6DISTNAME= frr-${VERSION} 6DISTNAME= frr-${VERSION}
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/}
9 9
10MAINTAINER= kardel@NetBSD.org 10MAINTAINER= kardel@NetBSD.org
11HOMEPAGE= https://github.com/FRRouting/frr/ 11HOMEPAGE= https://github.com/FRRouting/frr/
12COMMENT= Frr routing multi protocol suite 12COMMENT= Frr routing multi protocol suite
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS= quagga-[0-9]* 15CONFLICTS= quagga-[0-9]*
16 16
17WRKSRC= ${WRKDIR}/frr-frr-${VERSION} 17WRKSRC= ${WRKDIR}/frr-frr-${VERSION}
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf 19USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf bison
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22BUILD_DEFS= VARBASE 22BUILD_DEFS= VARBASE
 23BISON_REQD= 3.3
23 24
24.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
25.include "options.mk" 26.include "options.mk"
26 27
27# to pick up the atomic implementation on i386 28# to pick up the atomic implementation on i386
28.if ${MACHINE_ARCH} == "i386" 29.if ${MACHINE_ARCH} == "i386"
29CPPFLAGS+= -march=i586 30CPPFLAGS+= -march=i586
30.endif 31.endif
31 32
32FRR_GROUP?= _frr 33FRR_GROUP?= _frr
33FRR_VTY_GROUP?= frrvty 34FRR_VTY_GROUP?= frrvty
34 35
35FRR_USER?= _frr 36FRR_USER?= _frr