remove kmod-appletalk dependency, change description, and make init script executable...

SVN-Revision: 20779

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a97b47bde44477802bb34fc670ee149911d3585d..5aebcade3a484c978d4e899554afdc1e0dc3c317 100644 (file)
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
 PKG_VERSION:=2.0.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/netatalk/
 PKG_MD5SUM:=f35cd7a4ce26c780de380cd2bcae5ce6
@@ -19,13 +19,15 @@ include $(INCLUDE_DIR)/package.mk
 define Package/netatalk
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libdb47 +libgcrypt +libopenssl +kmod-appletalk
+  DEPENDS:=+libdb47 +libgcrypt +libopenssl
   TITLE:=netatalk
   URL:=http://netatalk.sourceforge.net
 endef
 
 define Package/netatalk/decription
-  Netatalk is an implementation of the AppleTalk protocol suite
+  Netatalk is a freely-available Open Source AFP fileserver.
+  It also provides a kernel level implementation of the AppleTalk
+  Protocol Suite.
 endef
 
 EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include
@@ -52,30 +54,14 @@ define Package/netatalk/install
        $(INSTALL_DIR) $(1)/usr/lib/uams/
        $(INSTALL_DIR) $(1)/etc/netatalk/
        $(INSTALL_DIR) $(1)/etc/init.d/
-       $(CP) \
-               $(PKG_BUILD_DIR)/etc/afpd/afpd \
-               $(1)/usr/sbin/
-       $(CP) \
-               $(PKG_BUILD_DIR)/bin/afppasswd/afppasswd \
-               $(1)/usr/sbin/
-       $(CP) \
-               $(PKG_BUILD_DIR)/etc/cnid_dbd/cnid_dbd \
-               $(1)/usr/sbin/
-       $(CP) \
-               $(PKG_BUILD_DIR)/etc/cnid_dbd/cnid_metad \
-               $(1)/usr/sbin/
-       $(CP) \
-               $(PKG_BUILD_DIR)/etc/uams/.libs/*.so \
-               $(1)/usr/lib/uams/
-       $(CP) \
-               ./files/AppleVolumes.* \
-               $(1)/etc/netatalk/
-       $(CP) \
-               ./files/afpd.conf \
-               $(1)/etc/netatalk/
-       $(CP) \
-               ./files/afpd.init \
-               $(1)/etc/init.d/afpd
+       $(CP) $(PKG_BUILD_DIR)/etc/afpd/afpd $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/bin/afppasswd/afppasswd $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/etc/cnid_dbd/cnid_dbd $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/etc/cnid_dbd/cnid_metad $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/etc/uams/.libs/*.so $(1)/usr/lib/uams/
+       $(CP) ./files/AppleVolumes.* $(1)/etc/netatalk/
+       $(INSTALL_CONF) ./files/afpd.conf $(1)/etc/netatalk/
+       $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd
 endef
 
 $(eval $(call BuildPackage,netatalk))

diff --git a/net/netatalk/files/afpd.init b/net/netatalk/files/afpd.init
index 2ce8421008259e495555af80f7693a6e521be457..8f8ea222248555af95b36f25ec4bba756153d7fe 100644 (file)
--- a/net/netatalk/files/afpd.init
+++ b/net/netatalk/files/afpd.init
@@ -8,8 +8,8 @@ PIDFILE="/var/run/afpd.pid"
 
 start()
 {
-       /usr/bin/cnid_metad
-       /usr/bin/afpd -F ${CONFIGFILE} -P ${PIDFILE} -c ${MAXCONS}
+       /usr/sbin/cnid_metad
+       /usr/sbin/afpd -F ${CONFIGFILE} -P ${PIDFILE} -c ${MAXCONS}
 }
 
 stop()