Attachment #190706 for bug #225962

Lines 1-3 Link Here

(-)/usr/ports/net/bird-devel/distinfo (-3 lines)
1	TIMESTAMP = 1512568931
2	SHA256 (bird-2.0.0-pre1.tar.gz) = f1d75703dd22e5d203e8bafc2d8266c4fdc823ea517c57ec36055dd32a62f369
3	SIZE (bird-2.0.0-pre1.tar.gz) = 1101988




#!/bin/sh

# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
#
# PROVIDE: bird
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# bird_enable (bool):   Set to NO by default.
#               Set it to YES to enable bird.
# bird_config (path):   Set to %%PREFIX%%/etc/bird.conf
#               by default.
#

. /etc/rc.subr

name="bird"
rcvar=bird_enable

command=%%PREFIX%%/sbin/${name}

load_rc_config $name

: ${bird_enable="NO"}
: ${bird_config="%%PREFIX%%/etc/bird.conf"}

command_args="-c $bird_config"

run_rc_command "$1"




--- Makefile.in.orig	2017-04-29 22:26:04 UTC
+++ Makefile.in
@@ -163,11 +163,7 @@ install: all
 	if test -n "@CLIENT@" ; then								\
 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
 	fi
-	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
-	else											\
-		echo "Not overwriting old bird.conf" ;						\
-	fi
+	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
 
 install-docs:
 	$(INSTALL) -d $(DESTDIR)/$(docdir)




# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $

PORTNAME=	bird
DISTVERSION=	2.0.0-pre1
CATEGORIES=	net
MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
		http://bird.mpls.in/distfiles/bird/
PKGNAMESUFFIX=	-devel

MAINTAINER=	melifaro@ipfw.ru
COMMENT=	Dynamic IP routing daemon (devel version)

CONFLICTS=	bird-[0-9]*

USES=		bison gmake readline
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--localstatedir=/var
USE_CSTD=	gnu89

MAKE_JOBS_UNSAFE=	yes

USE_RC_SUBR=	bird

.include <bsd.port.mk>




The BIRD project aims to develop a fully functional dynamic IP routing daemon.

- Both IPv4 and IPv6
- Multiple routing tables
- BGP
- RIP
- OSPF
- LDP
- L3VPN
- Static routes
- Inter-table protocol
- Command-line interface
- Soft reconfiguration
- Powerful language for route filtering

WWW: http://bird.mpls.in/

Lines 1-4 Link Here

(-)/usr/ports/net/bird-devel/pkg-plist (-4 lines)
1	@sample etc/bird.conf.example etc/bird.conf
2	sbin/bird
3	sbin/birdc
4	sbin/birdcl

Line 0 Link Here

(-)/usr/ports/net/bird2/distinfo (+3 lines)
	1	TIMESTAMP = 1518802884
	2	SHA256 (bird-2.0.1.tar.gz) = 5614b60d31a0e224a7e484126641dee7a5386a939f59373a48dfc1233b13d063
	3	SIZE (bird-2.0.1.tar.gz) = 1006261




#!/bin/sh

# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
#
# PROVIDE: bird
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# bird_enable (bool):   Set to NO by default.
#               Set it to YES to enable bird.
# bird_config (path):   Set to %%PREFIX%%/etc/bird.conf
#               by default.
#

. /etc/rc.subr

name="bird"
rcvar=bird_enable

command=%%PREFIX%%/sbin/${name}

load_rc_config $name

: ${bird_enable="NO"}
: ${bird_config="%%PREFIX%%/etc/bird.conf"}

command_args="-c $bird_config"

run_rc_command "$1"




--- Makefile.in.orig	2017-04-29 22:26:04 UTC
+++ Makefile.in
@@ -163,11 +163,7 @@ install: all
 	if test -n "@CLIENT@" ; then								\
 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
 	fi
-	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
-	else											\
-		echo "Not overwriting old bird.conf" ;						\
-	fi
+	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
 
 install-docs:
 	$(INSTALL) -d $(DESTDIR)/$(docdir)




# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $

PORTNAME=	bird
DISTVERSION=	2.0.1
CATEGORIES=	net
MASTER_SITES=	ftp://bird.network.cz/pub/bird/

MAINTAINER=	melifaro@ipfw.ru
COMMENT=	Dynamic IP routing daemon (devel version)

LICENSE=	GPLv2

CONFLICTS=	bird-[0-9]*

USES=		bison gmake readline
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--localstatedir=/var
USE_CSTD=	gnu89

OPTIONS_MULTI=	RP
RP_DESC=	Routing Protocols
OPTIONS_MULTI_RP=	BFD BABEL BGP OSPF PIPE RADV RIP STATIC
OPTIONS_DEFAULT:=	${OPTIONS_MULTI_RP}

BFD_DESC=	Bidirectional Forwarding Detection
BABEL_DESC=	Babel routing protocol
BGP_DESC=	Border Gateway Protocol
OSPF_DESC=	Open Short Path First
PIPE_DESC=	PIPE routing
RADV_DESC=	Router Advertisement
RIP_DESC=	Routing Information Protocol
STATIC_DESC=	Static routing

BFD_VARS=	rt_prot+=bfd
BABEL_VARS=	rt_prot+=babel
BGP_VARS=	rt_prot+=bgp
OSPF_VARS=	rt_prot+=ospf
PIPE_VARS=	rt_prot+=pipe
RADV_VARS=	rt_prot+=radv
RIP_VARS=	rt_prot+=rip
STATIC_VARS=	rt_prot+=static

CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"

MAKE_JOBS_UNSAFE=	yes

USE_RC_SUBR=	bird

.include <bsd.port.mk>




The BIRD project aims to develop a fully functional dynamic IP routing daemon.

- Both IPv4 and IPv6
- Multiple routing tables
- BGP
- RIP
- OSPF
- LDP
- L3VPN
- Static routes
- Inter-table protocol
- Command-line interface
- Soft reconfiguration
- Powerful language for route filtering

WWW: http://bird.network.cz/

Line 0 Link Here

(-)/usr/ports/net/bird2/pkg-plist (+4 lines)
	1	@sample etc/bird.conf.example etc/bird.conf
	2	sbin/bird
	3	sbin/birdc
	4	sbin/birdcl

Return to bug 225962

Lines 1-32 Link Here

(-)/usr/ports/net/bird-devel/files/bird.in (-32 lines)
1	#!/bin/sh
2
3	# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
4	#
5	# PROVIDE: bird
6	# REQUIRE: LOGIN
7	# KEYWORD: shutdown
8	#
9	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
10	# to enable this service:
11	#
12	# bird_enable (bool): Set to NO by default.
13	# Set it to YES to enable bird.
14	# bird_config (path): Set to %%PREFIX%%/etc/bird.conf
15	# by default.
16	#
17
18	. /etc/rc.subr
19
20	name="bird"
21	rcvar=bird_enable
22
23	command=%%PREFIX%%/sbin/${name}
24
25	load_rc_config $name
26
27	: ${bird_enable="NO"}
28	: ${bird_config="%%PREFIX%%/etc/bird.conf"}
29
30	command_args="-c $bird_config"
31
32	run_rc_command "$1"

Lines 1-15 Link Here

(-)/usr/ports/net/bird-devel/files/patch-Makefile.in (-15 lines)
1	--- Makefile.in.orig 2017-04-29 22:26:04 UTC
2	+++ Makefile.in
3	@@ -163,11 +163,7 @@ install: all
4	if test -n "@CLIENT@" ; then \
5	$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ; \
6	fi
7	- if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \
8	- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \
9	- else \
10	- echo "Not overwriting old bird.conf" ; \
11	- fi
12	+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
13
14	install-docs:
15	$(INSTALL) -d $(DESTDIR)/$(docdir)

Lines 1-25 Link Here

(-)/usr/ports/net/bird-devel/Makefile (-25 lines)
1	# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
2	# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $
3
4	PORTNAME= bird
5	DISTVERSION= 2.0.0-pre1
6	CATEGORIES= net
7	MASTER_SITES= ftp://bird.network.cz/pub/bird/ \
8	http://bird.mpls.in/distfiles/bird/
9	PKGNAMESUFFIX= -devel
10
11	MAINTAINER= melifaro@ipfw.ru
12	COMMENT= Dynamic IP routing daemon (devel version)
13
14	CONFLICTS= bird-[0-9]*
15
16	USES= bison gmake readline
17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --localstatedir=/var
19	USE_CSTD= gnu89
20
21	MAKE_JOBS_UNSAFE= yes
22
23	USE_RC_SUBR= bird
24
25	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)/usr/ports/net/bird-devel/pkg-descr (-16 lines)
1	The BIRD project aims to develop a fully functional dynamic IP routing daemon.
2
3	- Both IPv4 and IPv6
4	- Multiple routing tables
5	- BGP
6	- RIP
7	- OSPF
8	- LDP
9	- L3VPN
10	- Static routes
11	- Inter-table protocol
12	- Command-line interface
13	- Soft reconfiguration
14	- Powerful language for route filtering
15
16	WWW: http://bird.mpls.in/

Line 0 Link Here

(-)/usr/ports/net/bird2/files/bird.in (+32 lines)
	1	#!/bin/sh
	2
	3	# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
	4	#
	5	# PROVIDE: bird
	6	# REQUIRE: LOGIN
	7	# KEYWORD: shutdown
	8	#
	9	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
	10	# to enable this service:
	11	#
	12	# bird_enable (bool): Set to NO by default.
	13	# Set it to YES to enable bird.
	14	# bird_config (path): Set to %%PREFIX%%/etc/bird.conf
	15	# by default.
	16	#
	17
	18	. /etc/rc.subr
	19
	20	name="bird"
	21	rcvar=bird_enable
	22
	23	command=%%PREFIX%%/sbin/${name}
	24
	25	load_rc_config $name
	26
	27	: ${bird_enable="NO"}
	28	: ${bird_config="%%PREFIX%%/etc/bird.conf"}
	29
	30	command_args="-c $bird_config"
	31
	32	run_rc_command "$1"

Line 0 Link Here

(-)/usr/ports/net/bird2/files/patch-Makefile.in (+15 lines)
	1	--- Makefile.in.orig 2017-04-29 22:26:04 UTC
	2	+++ Makefile.in
	3	@@ -163,11 +163,7 @@ install: all
	4	if test -n "@CLIENT@" ; then \
	5	$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ; \
	6	fi
	7	- if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \
	8	- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \
	9	- else \
	10	- echo "Not overwriting old bird.conf" ; \
	11	- fi
	12	+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
	13
	14	install-docs:
	15	$(INSTALL) -d $(DESTDIR)/$(docdir)

Line 0 Link Here

(-)/usr/ports/net/bird2/Makefile (+50 lines)
	1	# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
	2	# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $
	3
	4	PORTNAME= bird
	5	DISTVERSION= 2.0.1
	6	CATEGORIES= net
	7	MASTER_SITES= ftp://bird.network.cz/pub/bird/
	8
	9	MAINTAINER= melifaro@ipfw.ru
	10	COMMENT= Dynamic IP routing daemon (devel version)
	11
	12	LICENSE= GPLv2
	13
	14	CONFLICTS= bird-[0-9]*
	15
	16	USES= bison gmake readline
	17	GNU_CONFIGURE= yes
	18	CONFIGURE_ARGS= --localstatedir=/var
	19	USE_CSTD= gnu89
	20
	21	OPTIONS_MULTI= RP
	22	RP_DESC= Routing Protocols
	23	OPTIONS_MULTI_RP= BFD BABEL BGP OSPF PIPE RADV RIP STATIC
	24	OPTIONS_DEFAULT:= ${OPTIONS_MULTI_RP}
	25
	26	BFD_DESC= Bidirectional Forwarding Detection
	27	BABEL_DESC= Babel routing protocol
	28	BGP_DESC= Border Gateway Protocol
	29	OSPF_DESC= Open Short Path First
	30	PIPE_DESC= PIPE routing
	31	RADV_DESC= Router Advertisement
	32	RIP_DESC= Routing Information Protocol
	33	STATIC_DESC= Static routing
	34
	35	BFD_VARS= rt_prot+=bfd
	36	BABEL_VARS= rt_prot+=babel
	37	BGP_VARS= rt_prot+=bgp
	38	OSPF_VARS= rt_prot+=ospf
	39	PIPE_VARS= rt_prot+=pipe
	40	RADV_VARS= rt_prot+=radv
	41	RIP_VARS= rt_prot+=rip
	42	STATIC_VARS= rt_prot+=static
	43
	44	CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
	45
	46	MAKE_JOBS_UNSAFE= yes
	47
	48	USE_RC_SUBR= bird
	49
	50	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/ports/net/bird2/pkg-descr (+16 lines)
	1	The BIRD project aims to develop a fully functional dynamic IP routing daemon.
	2
	3	- Both IPv4 and IPv6
	4	- Multiple routing tables
	5	- BGP
	6	- RIP
	7	- OSPF
	8	- LDP
	9	- L3VPN
	10	- Static routes
	11	- Inter-table protocol
	12	- Command-line interface
	13	- Soft reconfiguration
	14	- Powerful language for route filtering
	15
	16	WWW: http://bird.network.cz/