memcached: remove submenu, fix copyright year, add memory option to default config

SVN-Revision: 19913

diff --git a/net/memcached/Makefile b/net/memcached/Makefile
index 4fbcca2b073d05d21209ce206eb1703cb4dc493a..41dfd2c1608b8c248b6fe328cd69ad136fbb6bee 100644 (file)
--- a/net/memcached/Makefile
+++ b/net/memcached/Makefile
@@ -19,9 +19,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/memcached
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libevent librt
+  DEPENDS:=+libevent
   TITLE:=The high-performance, distributed memory object caching system
-  SUBMENU:=Web
   MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 endef
 
@@ -48,7 +47,7 @@ define Package/memcached/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/memcached $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_CONF) ./files/memcached $(1)/etc/config/memcached
+       $(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/memcached.init $(1)/etc/init.d/memcached
 endef

diff --git a/net/memcached/files/memcached b/net/memcached/files/memcached
deleted file mode 100644 (file)
index 56d1952..0000000
--- a/net/memcached/files/memcached
+++ /dev/null
@@ -1,5 +0,0 @@
-config memcached
-    option user 'nobody'
-    option maxconn '1024'
-    option listen '0.0.0.0'
-    option port '11211'

diff --git a/net/memcached/files/memcached.config b/net/memcached/files/memcached.config
new file mode 100644 (file)
index 0000000..4071116
--- /dev/null
+++ b/net/memcached/files/memcached.config
@@ -0,0 +1,6 @@
+config memcached
+       option user 'nobody'
+       option maxconn '1024'
+       option listen '0.0.0.0'
+       option port '11211'
+       option memory '64'

diff --git a/net/memcached/files/memcached.init b/net/memcached/files/memcached.init
index 64aea1912babc0e2fba58a22129cd9f55b58cc3c..1ba27d60d54e42cd2fc4313c09d6f6d850ea6356 100644 (file)
--- a/net/memcached/files/memcached.init
+++ b/net/memcached/files/memcached.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2010 OpenWrt.org
 START=80
 
 start_service () {
@@ -10,7 +10,7 @@ start_service () {
         config_get port "$section" port
         config_get memory "$section" memory
 
-        memcached_args="-d -p ${port:-"11211"} -u ${user:-"nobody"}  -c ${maxconn:-"1024"} -l ${listen:-"0.0.0.0"}  -U ${port:-"11211"} -m${memory:-"64"}"
+        memcached_args="-d -u ${user:-nobody} -c ${maxconn:-1024} -l ${listen:-0.0.0.0} -p ${port:-11211} -U ${port:-11211} -m ${memory:-64}"
         memcached $memcached_args >/dev/null 2>&1
 }