diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2017-12-06 14:16:51 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2017-12-06 14:16:51 +0000 |
| commit | 89f9702b7e42589799845d8ed8f4443d32f85c94 (patch) | |
| tree | a45e5b81b374abebd614591146fc9300dcc85266 | |
| parent | f800405c46aaa157c3a0fe5d74a3b92befbdf5b1 (diff) | |
| download | ports-89f9702b7e42589799845d8ed8f4443d32f85c94.tar.gz ports-89f9702b7e42589799845d8ed8f4443d32f85c94.zip | |
Notes
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | net/Makefile | 1 | ||||
| -rw-r--r-- | net/bird/Makefile | 18 | ||||
| -rw-r--r-- | net/bird6/Makefile | 16 | ||||
| -rw-r--r-- | net/bird6/pkg-descr | 15 | ||||
| -rw-r--r-- | net/bird6/pkg-plist | 4 |
6 files changed, 13 insertions, 42 deletions
@@ -9807,3 +9807,4 @@ games/linux-rtcw|games/iortcw|2017-12-01|Has expired: Use the native and open so 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@ipv6|2017-12-06|Moved to a flavored version diff --git a/net/Makefile b/net/Makefile index 22d507860eca..1e6e444d0979 100644 --- a/net/Makefile +++ b/net/Makefile @@ -49,7 +49,6 @@ SUBDIR += binkd SUBDIR += bird SUBDIR += bird-devel - SUBDIR += bird6 SUBDIR += bittwist SUBDIR += bluemix-cli SUBDIR += bmon diff --git a/net/bird/Makefile b/net/bird/Makefile index 7ebe5fd78c39..45755c4fe1c3 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -1,7 +1,7 @@ # Created by: Pav Lucistnik <pav@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@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} - -SUB_LIST+= PORTNAME=${PORTNAME} +USE_RC_SUBR= ${PKGBASE} +.if ${FLAVOR:U} == ipv6 +CONFIGURE_ARGS+= --enable-ipv6 +PLIST_SUB= VER=6 +.else PLIST_SUB?= VER="" +.endif FIREWALL_EXTRA_PATCHES+= ${FILESDIR}/firewall_support.patch diff --git a/net/bird6/Makefile b/net/bird6/Makefile deleted file mode 100644 index 729d36bd2433..000000000000 --- a/net/bird6/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Pav Lucistnik <pav@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= bird6 -COMMENT= Dynamic IP routing daemon (IPv6 version) -DISTNAME= bird-${PORTVERSION} - -MASTERDIR= ${.CURDIR}/../bird - -USE_RC_SUBR= ${PORTNAME} - -PLIST_SUB= VER="6" - -CONFIGURE_ARGS= --enable-ipv6 - -.include "${MASTERDIR}/Makefile" diff --git a/net/bird6/pkg-descr b/net/bird6/pkg-descr deleted file mode 100644 index 1d67db3a22fb..000000000000 --- a/net/bird6/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The BIRD project aims to develop a fully functional dynamic IP routing daemon. - -- Both IPv4 and IPv6 -- Multiple routing tables -- BGP -- RIP -- OSPF -- Static routes -- IPv6 Router Advertisements -- Inter-table protocol -- Command-line interface -- Soft reconfiguration -- Powerful language for route filtering - -WWW: http://bird.network.cz/ diff --git a/net/bird6/pkg-plist b/net/bird6/pkg-plist deleted file mode 100644 index eae1c273252e..000000000000 --- a/net/bird6/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -@sample etc/bird6.conf.example etc/bird6.conf -sbin/bird6 -sbin/birdc6 -sbin/birdcl6 |