From ebb58643eb864c2d26c2a47fbf87ee96a8580495 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 21 Apr 2006 08:39:19 +0000
Subject: [PATCH] convert bridge package to buildroot-ng

SVN-Revision: 3689
---
 openwrt/package/bridge/Config.in           | 10 -------
 openwrt/package/bridge/Makefile            | 34 +++++++++++++++-------
 openwrt/package/bridge/ipkg/bridge.control |  4 ---
 3 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 openwrt/package/bridge/Config.in
 delete mode 100644 openwrt/package/bridge/ipkg/bridge.control

diff --git a/openwrt/package/bridge/Config.in b/openwrt/package/bridge/Config.in
deleted file mode 100644
index b7f7babc68..0000000000
--- a/openwrt/package/bridge/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_BRIDGE
-	prompt "bridge............................ Ethernet bridging configuration utility"
-	tristate
-	default y
-	help
-	  Manage ethernet bridging; a way to connect networks together to 
-	  form a larger network.
-	  
-	  http://bridge.sourceforge.net/
-
diff --git a/openwrt/package/bridge/Makefile b/openwrt/package/bridge/Makefile
index 601373b994..be52b2a975 100644
--- a/openwrt/package/bridge/Makefile
+++ b/openwrt/package/bridge/Makefile
@@ -5,18 +5,26 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bridge
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 
-PKG_SOURCE_URL:=@SF/bridge
-PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
+PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/bridge
+PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
-$(eval $(call PKG_template,BRIDGE,bridge,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+define Package/bridge
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=Ethernet bridging configuration utility
+DESCRIPTION:=Manage ethernet bridging; a way to connect networks together to\\\
+form a larger network.
+URL:=http://bridge.sourceforge.net/
+endef
+
+define Build/Configure
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		./configure \
@@ -34,16 +42,20 @@ $(PKG_BUILD_DIR)/.configured:
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
-		--with-linux-headers=$(LINUX_DIR) \
-	);
-	touch $@
+		--with-linux-headers=$(LINUX_DIR)
+endef
 
-$(PKG_BUILD_DIR)/.built:
+
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
 	touch $@
+endef
 
-$(IPKG_BRIDGE): 
+define Package/busybox/install
 	mkdir -p $(IDIR_BRIDGE)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
 	$(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl
 	$(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR)
+endef
+
+$(eval $(call BuildPackage,bridge))
diff --git a/openwrt/package/bridge/ipkg/bridge.control b/openwrt/package/bridge/ipkg/bridge.control
deleted file mode 100644
index cc7c9d9c83..0000000000
--- a/openwrt/package/bridge/ipkg/bridge.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bridge
-Priority: essential
-Section: net
-Description: Ethernet bridging tools