reorganize/rationalize/format package menuconfig,

make updatedd modular

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2333 3c298f89-4303-0410-b956-a3cf2f4a3e73

11 files changed, 129 insertions, 67 deletions

diff --git a/package/updatedd/Config.in b/package/updatedd/Config.in
index 0862021890..77bda5e192 100644
--- a/package/updatedd/Config.in
+++ b/package/updatedd/Config.in
@@ -1,45 +1,73 @@
+menu "updatedd.......................... A tool to update dynamic dns services"
+
 config BR2_PACKAGE_UPDATEDD
-        tristate "updatedd - a tool to update dynamic dns services"
-        default m if CONFIG_DEVEL
-        help
-		Updatedd is a small tool that will update one of many dynamic
-		dns services on boot. Please look at the /etc/init.d/S50ddns
-		script for more info.
+	prompt "updatedd.......................... A tool to update dynamic DNS services"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  Updatedd is a small tool that will update one of many dynamic
+	  dns services on boot.
+	  
+	  Please look at the /etc/init.d/S50ddns script for more info.
+	  
+	  http://www.philipp-benner.de/updatedd/
 
+if BR2_PACKAGE_UPDATEDD
+comment          "Plugin                           Dynamic DNS service"
+endif
 
-config BR2_PACKAGE_UPDATEDD_CHANGEIP
-	bool "changeip.com"
+config BR2_PACKAGE_UPDATEDD_MOD_CHANGEIP
+	prompt   "updatedd-mod-changeip........... changeip.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_DYNDNS
-	bool "dyndns.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_DYNDNS
+	prompt   "updatedd-mod-dyndns............. dyndns.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_EURODYNDNS
-	bool "eurodyndns.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_EURODYNDNS
+	prompt   "updatedd-mod-eurodyndns......... eurodyndns.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_HN
-	bool "hn.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_HN
+	prompt   "updatedd-mod-hn................. hn.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_NOIP
-	bool "no-ip.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_NOIP
+	prompt   "updatedd-mod-noip............... no-ip.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_ODS
-	bool "ods.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_ODS
+	prompt   "updatedd-mod-ods................ ods.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_OVH
-	bool "ovh.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_OVH
+	prompt   "updatedd-mod-ovh................ ovh.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_REGFISH
-	bool "regfish.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_REGFISH
+	prompt   "updatedd-mod-regfish............ regfish.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_TZO
-	bool "tzo.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_TZO
+	prompt   "updatedd-mod-tzo................ tzo.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
+	default m if CONFIG_DEVEL
+
+endmenu
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index 1279015fb1..cc88b5a616 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -16,7 +16,36 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
+define PKG_mod_template
+
+$$(IPKG_$(1)):
+	install -d -m0755 $$(IDIR_$(1))/usr/lib/updatedd
+	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/updatedd/$(2).so $$(IDIR_$(1))/usr/lib/updatedd/
+	$(RSTRIP) $$(IDIR_$(1))
+	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+
+endef
+
 $(eval $(call PKG_template,UPDATEDD,updatedd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_CHANGEIP,changeip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_DYNDNS,dyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_EURODYNDNS,eurodyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_HN,hn))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_NOIP,noip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_ODS,ods))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_OVH,ovh))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_REGFISH,regfish))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_TZO,tzo))
 
 $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); \
@@ -42,41 +71,10 @@ $(PKG_BUILD_DIR)/.built:
 	touch $@
 
 $(IPKG_UPDATEDD):
+	install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d
+	install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/
 	install -d -m0755 $(IDIR_UPDATEDD)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/updatedd
-
-	install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d/
-	install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/S55ddns
-
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/
 	install -d -m0755 $(IDIR_UPDATEDD)/usr/lib/updatedd
-
-ifeq ($(BR2_PACKAGE_UPDATEDD_CHANGEIP),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/changeip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/changeip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_DYNDNS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/dyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/dyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_EURODYNDNS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/eurodyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/eurodyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_HN),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/hn.so $(IDIR_UPDATEDD)/usr/lib/updatedd/hn.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_NOIP),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/noip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/noip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_ODS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ods.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ods.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_OVH),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ovh.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ovh.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_REGFISH),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/regfish.so $(IDIR_UPDATEDD)/usr/lib/updatedd/regfish.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_TZO),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/tzo.so $(IDIR_UPDATEDD)/usr/lib/updatedd/tzo.so
-endif
-
 	$(RSTRIP) $(IDIR_UPDATEDD)
 	$(IPKG_BUILD) $(IDIR_UPDATEDD) $(PACKAGE_DIR)
diff --git a/package/updatedd/ipkg/updatedd-mod-changeip.control b/package/updatedd/ipkg/updatedd-mod-changeip.control
new file mode 100644
index 0000000000..986752b77d
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-changeip.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-changeip
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for changeip.com dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-dyndns.control b/package/updatedd/ipkg/updatedd-mod-dyndns.control
new file mode 100644
index 0000000000..93c62fd47b
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-dyndns.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-dyndns
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for dyndns.org dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-eurodyndns.control b/package/updatedd/ipkg/updatedd-mod-eurodyndns.control
new file mode 100644
index 0000000000..f29e59810c
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-eurodyndns.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-eurodyndns
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for eurodyndns.org dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-hn.control b/package/updatedd/ipkg/updatedd-mod-hn.control
new file mode 100644
index 0000000000..d5b57c076a
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-hn.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-hn
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for hn.org dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-noip.control b/package/updatedd/ipkg/updatedd-mod-noip.control
new file mode 100644
index 0000000000..925bd7685b
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-noip.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-noip
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for no-ip.org dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-ods.control b/package/updatedd/ipkg/updatedd-mod-ods.control
new file mode 100644
index 0000000000..e47b4a6e36
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-ods.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-ods
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for ods.org dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-ovh.control b/package/updatedd/ipkg/updatedd-mod-ovh.control
new file mode 100644
index 0000000000..d1eb9f219a
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-ovh.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-ovh
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for ovh.com dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-regfish.control b/package/updatedd/ipkg/updatedd-mod-regfish.control
new file mode 100644
index 0000000000..f17fffe875
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-regfish.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-regfish
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for regfish.com dynamic DNS service.
diff --git a/package/updatedd/ipkg/updatedd-mod-tzo.control b/package/updatedd/ipkg/updatedd-mod-tzo.control
new file mode 100644
index 0000000000..089dfde077
--- /dev/null
+++ b/package/updatedd/ipkg/updatedd-mod-tzo.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-tzo
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for tzo.com dynamic DNS service.