svn commit: r455651 - in head: . net net/bird net/bird6

[Mathieu Arnold]

Author: mat
Date: Wed Dec  6 14:16:51 2017
New Revision: 455651
URL: https://svnweb.freebsd.org/changeset/ports/455651

Log:
  Fold back net/bird6 into net/bird with FLAVORS.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Deleted:
  head/net/bird6/
Modified:
  head/MOVED
  head/net/Makefile   (contents, props changed)
  head/net/bird/Makefile   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Dec  6 13:56:27 2017	(r455650)
+++ head/MOVED	Wed Dec  6 14:16:51 2017	(r455651)
@@ -9807,3 +9807,4 @@ games/linux-rtcw|games/iortcw|2017-12-01|Has expired: 
 java/bootstrap-openjdk|java/bootstrap-openjdk6|2017-12-01|Has expired: superseded by java/bootstrap-openjdk[68]
 lang/gcc46|lang/gcc6|2017-12-01|Has expired: Unsupported by upstream. Use GCC 6 or newer instead.
 security/krb5-113|security/krb5-114|2017-12-03|Has expired: EOL twelve months after release of krb5-1.15
+net/bird6|net/bird at ipv6|2017-12-06|Moved to a flavored version

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Wed Dec  6 13:56:27 2017	(r455650)
+++ head/net/Makefile	Wed Dec  6 14:16:51 2017	(r455651)
@@ -49,7 +49,6 @@
     SUBDIR += binkd
     SUBDIR += bird
     SUBDIR += bird-devel
-    SUBDIR += bird6
     SUBDIR += bittwist
     SUBDIR += bluemix-cli
     SUBDIR += bmon

Modified: head/net/bird/Makefile
==============================================================================
--- head/net/bird/Makefile	Wed Dec  6 13:56:27 2017	(r455650)
+++ head/net/bird/Makefile	Wed Dec  6 14:16:51 2017	(r455651)
@@ -1,7 +1,7 @@
 # Created by: Pav Lucistnik <pav at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	bird
+PORTNAME=	bird
 PORTVERSION=	1.6.3
 PORTREVISION=	3
 CATEGORIES=	net
@@ -9,13 +9,16 @@ MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/
 
 MAINTAINER=	melifaro at ipfw.ru
-COMMENT?=	Dynamic IP routing daemon (IPv4 version)
+COMMENT?=	Dynamic IP routing daemon (${FLAVOR:Uipv4:S/ip/IP/} version)
 
 LICENSE=	GPLv2
 
+FLAVORS=	ipv4 ipv6
+ipv6_PKGNAMESUFFIX=	6
+
 USES=		bison gmake ncurses readline
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS=	--localstatedir=/var
 
 OPTIONS_DEFINE?=	FIREWALL
 FIREWALL_DESC=	Enable firewall protocol
@@ -23,11 +26,14 @@ NO_OPTIONS_SORT=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_RC_SUBR=	${PORTNAME}
+USE_RC_SUBR=	${PKGBASE}
 
-SUB_LIST+=	PORTNAME=${PORTNAME}
-
+.if ${FLAVOR:U} == ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
+PLIST_SUB=	VER=6
+.else
 PLIST_SUB?=	VER=""
+.endif
 
 FIREWALL_EXTRA_PATCHES+=	${FILESDIR}/firewall_support.patch