convert dhcp-forwarder to new packaging style

SVN-Revision: 850

diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile
index c9d5ff9f582846c4a71e62efacff3a01697e36bb..7b9f23841f3757d9c6eebe9996b642b5775e681e 100644 (file)
--- a/openwrt/package/dhcp-forwarder/Makefile
+++ b/openwrt/package/dhcp-forwarder/Makefile
@@ -7,28 +7,18 @@ PKG_VERSION := 0.7
 PKG_RELEASE := 4
 PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2
 
-PKG_SOURCE_URL := \
-       http://savannah.nongnu.org/download/dhcp-fwd/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL := http://savannah.nongnu.org/download/dhcp-fwd
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT := bzcat
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_DHCP_FORWARDER:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_DHCP_FORWARDER:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_DHCP_FORWARDER:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,DHCP_FORWARDER,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       rm -rf $(PKG_BUILD_DIR)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured: 
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -54,22 +44,18 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                cfg_filename="/etc/dhcp-fwd.conf"
-       touch $(PKG_BUILD_DIR)/.built
-
-$(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd: $(PKG_BUILD_DIR)/.built
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
+       touch $(PKG_BUILD_DIR)/.built
        
-$(IPKG_DHCP_FORWARDER): $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_DHCP_FORWARDER) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       install -m0644 ./ipkg/$(PKG_NAME).conffiles $(IDIR_DHCP_FORWARDER)/CONTROL/conffiles
+$(IPKG_DHCP_FORWARDER):
        install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
        install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
        install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc
@@ -78,15 +64,3 @@ $(IPKG_DHCP_FORWARDER): $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/
        $(RSTRIP) $(IDIR_DHCP_FORWARDER)
        $(IPKG_BUILD) $(IDIR_DHCP_FORWARDER) $(PACKAGE_DIR)
-
-$(INFO_DHCP_FORWARDER): $(IPKG_DHCP_FORWARDER)
-       $(IPKG) install $(IPKG_DHCP_FORWARDER)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_DHCP_FORWARDER)
-install: $(INFO_DHCP_FORWARDER)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -rf $(IPKG_DHCP_FORWARDER)