From a383f50dd7a099c2b228d904b6fb54ad9292d926 Mon Sep 17 00:00:00 2001
From: Philipp Hirsch <itself@hanspolo.net>
Date: Tue, 28 Apr 2015 22:09:13 +0200
Subject: [PATCH] bird: Merge bird6 into bird

---
 srcpkgs/bird/template | 16 +++++-----------
 srcpkgs/bird6         |  1 -
 2 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/bird6

diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 5f1c5571234..60c44836af2 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -11,7 +11,8 @@ homepage="http://bird.network.cz"
 distfiles="ftp://bird.network.cz/pub/$pkgname/$pkgname-$version.tar.gz"
 hostmakedepends="flex"
 makedepends="ncurses-devel readline-devel"
-conf_files="/etc/bird.conf"
+configure_args="--sbindir=/usr/bin"
+conf_files="/etc/bird.conf /etc/bird6.conf"
 checksum=79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
 
 pre_configure() {
@@ -41,15 +42,8 @@ do_build() {
 do_install() {
 	make DESTDIR=$DESTDIR install
 	vsv bird
-}
 
-bird6_package() {
-	short_desc+=" - ipv6 edition"
-	conf_files="/etc/bird6.conf"
-
-	pkg_install() {
-		cd bird6
-		make DESTDIR=$PKGDESTDIR install
-		vsv bird6
-	}
+	cd bird6
+	make DESTDIR=$PKGDESTDIR install
+	vsv bird6
 }
diff --git a/srcpkgs/bird6 b/srcpkgs/bird6
deleted file mode 120000
index 016bc96260e..00000000000
--- a/srcpkgs/bird6
+++ /dev/null
@@ -1 +0,0 @@
-bird
\ No newline at end of file