Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jan 2019 15:19:16 +0000 (UTC)
From:      Olivier Cochard <olivier@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r489701 - in head/net/bird2: . files
Message-ID:  <201901081519.x08FJGRT041164@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivier
Date: Tue Jan  8 15:19:16 2019
New Revision: 489701
URL: https://svnweb.freebsd.org/changeset/ports/489701

Log:
  Update to 2.0.3 and add birdvty group

Deleted:
  head/net/bird2/files/patch-sysdep_bsd_setkey.h
Modified:
  head/net/bird2/Makefile
  head/net/bird2/distinfo
  head/net/bird2/files/bird.in
  head/net/bird2/files/patch-Makefile.in

Modified: head/net/bird2/Makefile
==============================================================================
--- head/net/bird2/Makefile	Tue Jan  8 15:18:51 2019	(r489700)
+++ head/net/bird2/Makefile	Tue Jan  8 15:19:16 2019	(r489701)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-DISTVERSION=	2.0.2
-PORTREVISION=	3
+DISTVERSION=	2.0.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/
 PKGNAMESUFFIX=	2
@@ -24,6 +23,8 @@ CONFIGURE_ARGS=	--localstatedir=/var
 USE_RC_SUBR=	bird
 SUB_FILES=	pkg-message
 
+GROUPS=		birdvty
+
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_MULTI=	RP
@@ -55,7 +56,7 @@ CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
 RPKI_LIB_DEPENDS=	libssh.so:security/libssh
 
 post-patch:
-	${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in
-	${MV} ${WRKSRC}/doc/bird.conf.example ${WRKSRC}/doc/bird.conf.sample
+	#${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in
+	#${MV} ${WRKSRC}/doc/bird.conf ${WRKSRC}/doc/bird.conf.sample
 
 .include <bsd.port.mk>

Modified: head/net/bird2/distinfo
==============================================================================
--- head/net/bird2/distinfo	Tue Jan  8 15:18:51 2019	(r489700)
+++ head/net/bird2/distinfo	Tue Jan  8 15:19:16 2019	(r489701)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521724692
-SHA256 (bird-2.0.2.tar.gz) = 035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f
-SIZE (bird-2.0.2.tar.gz) = 1015224
+TIMESTAMP = 1546923619
+SHA256 (bird-2.0.3.tar.gz) = 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de
+SIZE (bird-2.0.3.tar.gz) = 1141917

Modified: head/net/bird2/files/bird.in
==============================================================================
--- head/net/bird2/files/bird.in	Tue Jan  8 15:18:51 2019	(r489700)
+++ head/net/bird2/files/bird.in	Tue Jan  8 15:19:16 2019	(r489701)
@@ -26,7 +26,8 @@ load_rc_config $name
 
 : ${bird_enable="NO"}
 : ${bird_config="%%PREFIX%%/etc/bird.conf"}
+: ${bird_group="birdvty"}
 
-command_args="-c $bird_config"
+command_args="-c $bird_config -g $bird_group"
 
 run_rc_command "$1"

Modified: head/net/bird2/files/patch-Makefile.in
==============================================================================
--- head/net/bird2/files/patch-Makefile.in	Tue Jan  8 15:18:51 2019	(r489700)
+++ head/net/bird2/files/patch-Makefile.in	Tue Jan  8 15:19:16 2019	(r489701)
@@ -1,15 +1,15 @@
---- 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
+--- Makefile.in.orig	2019-01-08 06:06:39.654833000 +0100
++++ Makefile.in	2019-01-08 06:06:53.077532000 +0100
+@@ -188,11 +188,7 @@
+ 	for BIN in bird @CLIENT@ ; do								\
+ 		$(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ;		\
+ 	done
 -	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_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ;	\
  
  install-docs:
  	$(INSTALL) -d $(DESTDIR)/$(docdir)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901081519.x08FJGRT041164>