bird: Merge bird6 into bird

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
 }

srcpkgs/bird6

@@ -1 +0,0 @@
-bird