From d46e3230ce4197e790e4ff80796483a8c53a7457 Mon Sep 17 00:00:00 2001 From: Philipp Hirsch Date: Tue, 28 Apr 2015 18:19:41 +0200 Subject: [PATCH 1/4] New package: bird-1.5.0 --- srcpkgs/bird/files/bird/run | 2 ++ srcpkgs/bird/template | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 srcpkgs/bird/files/bird/run create mode 100644 srcpkgs/bird/template diff --git a/srcpkgs/bird/files/bird/run b/srcpkgs/bird/files/bird/run new file mode 100644 index 00000000000..5d764b554c0 --- /dev/null +++ b/srcpkgs/bird/files/bird/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec bird ${OPTS:=-c /etc/bird.conf -f} \ No newline at end of file diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template new file mode 100644 index 00000000000..874ecbba065 --- /dev/null +++ b/srcpkgs/bird/template @@ -0,0 +1,19 @@ +# 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 " +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 +} From 2c781de9846ceeb9807155aa087e6a423b13f9ee Mon Sep 17 00:00:00 2001 From: Philipp Hirsch Date: Tue, 28 Apr 2015 18:25:51 +0200 Subject: [PATCH 2/4] New package: bird6-1.5.0 --- srcpkgs/bird6/bird6/files/bird6/run | 2 ++ srcpkgs/bird6/bird6/template | 19 +++++++++++++++++++ srcpkgs/bird6/files/bird6/run | 2 ++ srcpkgs/bird6/template | 21 +++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 srcpkgs/bird6/bird6/files/bird6/run create mode 100644 srcpkgs/bird6/bird6/template create mode 100644 srcpkgs/bird6/files/bird6/run create mode 100644 srcpkgs/bird6/template diff --git a/srcpkgs/bird6/bird6/files/bird6/run b/srcpkgs/bird6/bird6/files/bird6/run new file mode 100644 index 00000000000..5d764b554c0 --- /dev/null +++ b/srcpkgs/bird6/bird6/files/bird6/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec bird ${OPTS:=-c /etc/bird.conf -f} \ No newline at end of file diff --git a/srcpkgs/bird6/bird6/template b/srcpkgs/bird6/bird6/template new file mode 100644 index 00000000000..874ecbba065 --- /dev/null +++ b/srcpkgs/bird6/bird6/template @@ -0,0 +1,19 @@ +# 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 " +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 +} diff --git a/srcpkgs/bird6/files/bird6/run b/srcpkgs/bird6/files/bird6/run new file mode 100644 index 00000000000..61876462928 --- /dev/null +++ b/srcpkgs/bird6/files/bird6/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec bird6 ${OPTS:=-c /etc/bird6.conf -f} \ No newline at end of file diff --git a/srcpkgs/bird6/template b/srcpkgs/bird6/template new file mode 100644 index 00000000000..ce896f8a23b --- /dev/null +++ b/srcpkgs/bird6/template @@ -0,0 +1,21 @@ +# 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 " +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 +} From 8113d782cfc1f6002cb1e1735b37f5ddbb8a7b0e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 28 Apr 2015 23:41:18 +0200 Subject: [PATCH 3/4] bird: merge with bird6 --- srcpkgs/bird/files/bird/run | 2 +- srcpkgs/bird/files/bird6/run | 2 ++ srcpkgs/bird/template | 38 ++++++++++++++++++++++++++++- srcpkgs/bird6 | 1 + srcpkgs/bird6/bird6/files/bird6/run | 2 -- srcpkgs/bird6/bird6/template | 19 --------------- srcpkgs/bird6/files/bird6/run | 2 -- srcpkgs/bird6/template | 21 ---------------- 8 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 srcpkgs/bird/files/bird6/run create mode 120000 srcpkgs/bird6 delete mode 100644 srcpkgs/bird6/bird6/files/bird6/run delete mode 100644 srcpkgs/bird6/bird6/template delete mode 100644 srcpkgs/bird6/files/bird6/run delete mode 100644 srcpkgs/bird6/template diff --git a/srcpkgs/bird/files/bird/run b/srcpkgs/bird/files/bird/run index 5d764b554c0..93df57f0b09 100644 --- a/srcpkgs/bird/files/bird/run +++ b/srcpkgs/bird/files/bird/run @@ -1,2 +1,2 @@ #!/bin/sh -exec bird ${OPTS:=-c /etc/bird.conf -f} \ No newline at end of file +exec bird -f ${OPTS:=-c /etc/bird.conf} diff --git a/srcpkgs/bird/files/bird6/run b/srcpkgs/bird/files/bird6/run new file mode 100644 index 00000000000..902c2426f8e --- /dev/null +++ b/srcpkgs/bird/files/bird6/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec bird6 -f ${OPTS:=-c /etc/bird6.conf} diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template index 874ecbba065..5f1c5571234 100644 --- a/srcpkgs/bird/template +++ b/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 + } +} diff --git a/srcpkgs/bird6 b/srcpkgs/bird6 new file mode 120000 index 00000000000..016bc96260e --- /dev/null +++ b/srcpkgs/bird6 @@ -0,0 +1 @@ +bird \ No newline at end of file diff --git a/srcpkgs/bird6/bird6/files/bird6/run b/srcpkgs/bird6/bird6/files/bird6/run deleted file mode 100644 index 5d764b554c0..00000000000 --- a/srcpkgs/bird6/bird6/files/bird6/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec bird ${OPTS:=-c /etc/bird.conf -f} \ No newline at end of file diff --git a/srcpkgs/bird6/bird6/template b/srcpkgs/bird6/bird6/template deleted file mode 100644 index 874ecbba065..00000000000 --- a/srcpkgs/bird6/bird6/template +++ /dev/null @@ -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 " -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 -} diff --git a/srcpkgs/bird6/files/bird6/run b/srcpkgs/bird6/files/bird6/run deleted file mode 100644 index 61876462928..00000000000 --- a/srcpkgs/bird6/files/bird6/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec bird6 ${OPTS:=-c /etc/bird6.conf -f} \ No newline at end of file diff --git a/srcpkgs/bird6/template b/srcpkgs/bird6/template deleted file mode 100644 index ce896f8a23b..00000000000 --- a/srcpkgs/bird6/template +++ /dev/null @@ -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 " -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 -} From a383f50dd7a099c2b228d904b6fb54ad9292d926 Mon Sep 17 00:00:00 2001 From: Philipp Hirsch Date: Tue, 28 Apr 2015 22:09:13 +0200 Subject: [PATCH 4/4] 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