bird{2,3}: use HTTPS in URL and reorder Makefile

Move descriptions to each other
and use HTTPS for project website

Signed-off-by: Josef Schlehofer <[email protected]>

diff --git a/bird2/Makefile b/bird2/Makefile
index 54a058c380c1f1afab896fd2587a4a9d9724c259..017ee71d51d1c300a3903634591fa5c74f85e8b0 100644 (file)
--- a/bird2/Makefile
+++ b/bird2/Makefile
@@ -22,17 +22,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/bird2/Default/description
-BIRD is an internet routing daemon which manages TCP/IP routing tables
-with support of modern routing protocols, easy to use configuration
-interface and powerful route filtering language. It is lightweight and
-efficient and therefore appropriate for small embedded routers.
-
-endef
-
 define Package/bird2
   TITLE:=The BIRD Internet Routing Daemon (v2)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -42,7 +34,7 @@ endef
 
 define Package/bird2c
   TITLE:=The BIRD command-line client (v2)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -52,7 +44,7 @@ endef
 
 define Package/bird2cl
   TITLE:=The BIRD lightweight command-line client (v2)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -60,6 +52,13 @@ define Package/bird2cl
   CONFLICTS:=bird1cl-ipv4 bird1cl-ipv6 birdcl4 birdcl6
 endef
 
+define Package/bird2/Default/description
+BIRD is an internet routing daemon which manages TCP/IP routing tables
+with support of modern routing protocols, easy to use configuration
+interface and powerful route filtering language. It is lightweight and
+efficient and therefore appropriate for small embedded routers.
+endef
+
 define Package/bird2/description
 $(call Package/bird2/Default/description)
 

diff --git a/bird3/Makefile b/bird3/Makefile
index 490da7d253bf2738d11160d37a8ed8826cb368c4..880595990fe480a995e1b6637977b3646c4f9999 100644 (file)
--- a/bird3/Makefile
+++ b/bird3/Makefile
@@ -18,17 +18,9 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/bird3/Default/description
-BIRD is an internet routing daemon which manages TCP/IP routing tables
-with support of modern routing protocols, easy to use configuration
-interface and powerful route filtering language. It is lightweight and
-efficient and therefore appropriate for small embedded routers.
-
-endef
-
 define Package/bird3
   TITLE:=The BIRD Internet Routing Daemon (v3)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -38,7 +30,7 @@ endef
 
 define Package/bird3c
   TITLE:=The BIRD command-line client (v3)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -48,7 +40,7 @@ endef
 
 define Package/bird3cl
   TITLE:=The BIRD lightweight command-line client (v2)
-  URL:=http://bird.network.cz/
+  URL:=https://bird.network.cz/
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
@@ -56,6 +48,13 @@ define Package/bird3cl
   CONFLICTS:=bird2
 endef
 
+define Package/bird3/Default/description
+BIRD is an internet routing daemon which manages TCP/IP routing tables
+with support of modern routing protocols, easy to use configuration
+interface and powerful route filtering language. It is lightweight and
+efficient and therefore appropriate for small embedded routers.
+endef
+
 define Package/bird3/description
 $(call Package/bird3/Default/description)