3 files changed, 11 insertions, 127 deletions
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index 13d9432b02..fd1a9719ba 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -7,24 +7,17 @@ PKG_VERSION:=3.0.11b8
 PKG_RELEASE:=1
 PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0
 
-# space separated list or special @SF for sourceforge projects
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \
 	http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-$(DL_DIR)/$(PKG_SOURCE):
-	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
+$(eval $(call PKG_template,EZIPUPDATE,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -46,27 +39,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
 		--sysconfdir=/etc \
 		$(DISABLE_NLS) \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/ez-ipupdate: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)
+	touch $@
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/ez-ipupdate
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin 
-	cp $(PKG_BUILD_DIR)/ez-ipupdate $(PKG_IPK_DIR)/usr/sbin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(IPKG_EZIPUPDATE):
+	mkdir -p $(IDIR_EZIPUPDATE)/usr/sbin 
+	cp $(PKG_BUILD_DIR)/ez-ipupdate $(IDIR_EZIPUPDATE)/usr/sbin/
+	$(STRIP) $(IDIR_EZIPUPDATE)/usr/sbin/*
+	$(IPKG_BUILD) $(IDIR_EZIPUPDATE) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
diff --git a/package/ez-ipupdate/ez-ipupdate.control b/package/ez-ipupdate/ipkg/ez-ipupdate.control
index 5d9628f51a..5d9628f51a 100644
--- a/package/ez-ipupdate/ez-ipupdate.control
+++ b/package/ez-ipupdate/ipkg/ez-ipupdate.control
diff --git a/package/ez-ipupdate/rules b/package/ez-ipupdate/rules
deleted file mode 100644
index f56d2b2761..0000000000
--- a/package/ez-ipupdate/rules
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/make -f
-
-ifeq ($(strip ${IPKG_DIR}),)
-	IPKG_DIR := $(shell pwd)/../..
-endif
-
-include $(IPKG_DIR)/Makefile.inc
-
-##
-
-EZ_IPUPDATE_DIR := ipkg/ez-ipupdate
-
-BUILD_DEPS := \
-
-##
-
-all: package
-
-build: .stamp-built
-
-install: .stamp-installed
-
-clean:
-
-	$(MAKE) clean
-	rm -rf .stamp-*
-	rm -rf $(EZ_IPUPDATE_DIR)/etc/ez-ipupdate
-	rm -rf $(EZ_IPUPDATE_DIR)/usr
-
-
-control:
-
-	@cat $(EZ_IPUPDATE_DIR)/CONTROL/control
-	@echo
-	
-
-binary package: .stamp-installed
-
-	@cat $(EZ_IPUPDATE_DIR)/CONTROL/control
-	$(IPKG_BUILD) $(EZ_IPUPDATE_DIR) $(IPKG_TARGET_DIR)
-
-
-.stamp-built: $(BUILD_DEPS)
-
-	rm -rf config.cache
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --prefix=/usr \
-	  --exec-prefix=/usr \
-	  --bindir=/usr/bin \
-	  --datadir=/usr/share \
-	  --includedir=/usr/include \
-	  --infodir=/usr/share/info \
-	  --libdir=/usr/lib \
-	  --libexecdir=/usr/lib/locate \
-	  --localstatedir=/var/lib \
-	  --mandir=/usr/share/man \
-	  --sbindir=/usr/sbin \
-	  --sysconfdir=/etc \
-	  $(DISABLE_NLS) \
-
-	$(MAKE) \
-	  $(TARGET_CONFIGURE_OPTS) \
-
-	touch .stamp-built
-
-
-.stamp-installed: .stamp-built
-
-	mkdir -p $(EZ_IPUPDATE_DIR)
-
-	$(MAKE) \
-	  DESTDIR="$(shell pwd)/$(EZ_IPUPDATE_DIR)" \
-	 install
-	 
-	mkdir -p $(EZ_IPUPDATE_DIR)/etc/ez-ipupdate
-	cp -a example-dyndns.conf $(EZ_IPUPDATE_DIR)/etc/ez-ipupdate/
-	
-	$(STRIP) $(EZ_IPUPDATE_DIR)/usr/bin/*
-
-	chmod 0755 $(EZ_IPUPDATE_DIR)/CONTROL
-	chmod 0644 $(EZ_IPUPDATE_DIR)/CONTROL/control
-	chmod 0755 $(EZ_IPUPDATE_DIR)/etc
-	chmod 0700 $(EZ_IPUPDATE_DIR)/etc/ez-ipupdate
-	chmod 0600 $(EZ_IPUPDATE_DIR)/etc/ez-ipupdate/*
-	chmod 0755 $(EZ_IPUPDATE_DIR)/usr
-	chmod 0755 $(EZ_IPUPDATE_DIR)/usr/bin
-	chmod 0755 $(EZ_IPUPDATE_DIR)/usr/bin/ez-ipupdate
-
-	touch .stamp-installed
-
-
-.PHONY: build install clean control binary package