bird: merge with bird6

srcpkgs/bird/files/bird/run

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec bird ${OPTS:=-c /etc/bird.conf -f}
+exec bird -f ${OPTS:=-c /etc/bird.conf}

srcpkgs/bird/files/bird6/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec bird6 -f ${OPTS:=-c /etc/bird6.conf}

srcpkgs/bird/template

@@ -14,6 +14,42 @@ makedepends="ncurses-devel readline-devel"
 conf_files="/etc/bird.conf"
 checksum=79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
 
-post_install() {
+pre_configure() {
+	mkdir -p /tmp/bird6
+	cp -a $wrksrc/* /tmp/bird6
+	mv /tmp/bird6 $wrksrc/bird6
+}
+
+do_configure() {
+	# bird
+	./configure ${configure_args}
+
+	# bird6
+	cd bird6
+	./configure ${configure_args} --enable-ipv6
+}
+
+do_build() {
+	# bird
+	make ${makejobs}
+
+	# bird6
+	cd bird6
+	make ${makejobs}
+}
+
+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
+	}
+}

srcpkgs/bird6

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

srcpkgs/bird6/bird6/files/bird6/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec bird ${OPTS:=-c /etc/bird.conf -f}

srcpkgs/bird6/bird6/template

@@ -1,19 +0,0 @@
-# Template file for 'bird'
-
-pkgname=bird
-version=1.5.0
-revision=1
-build_style=gnu-configure
-short_desc="The BIRD Internet Routing Daemon"
-maintainer="Philipp Hirsch <itself@hanspolo.net>"
-license="GPL-3"
-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"
-checksum=79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
-
-post_install() {
-	vsv bird
-}

srcpkgs/bird6/files/bird6/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec bird6 ${OPTS:=-c /etc/bird6.conf -f}

srcpkgs/bird6/template

@@ -1,21 +0,0 @@
-# Template file for 'bird6'
-
-pkgname=bird6
-version=1.5.0
-revision=1
-build_style=gnu-configure
-short_desc="The BIRD Internet Routing Daemon"
-maintainer="Philipp Hirsch <itself@hanspolo.net>"
-license="GPL-3"
-homepage="http://bird.network.cz"
-distfiles="ftp://bird.network.cz/pub/bird/bird-$version.tar.gz"
-wrksrc=bird-$version
-hostmakedepends="flex"
-makedepends="ncurses-devel readline-devel"
-configure_args="--enable-ipv6"
-conf_files="/etc/bird6.conf"
-checksum=79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
-
-post_install() {
-	vsv bird6
-}