From 60284bca259722b5f5257168318ea4b02b8d95c3 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 10 Apr 2010 18:33:01 +0000
Subject: [PATCH] remove kmod-appletalk dependency, change description, and
 make init script executable (#6619)

SVN-Revision: 20779
---
 net/netatalk/Makefile        | 40 ++++++++++++------------------------
 net/netatalk/files/afpd.init |  4 ++--
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a97b47bde..5aebcade3 100644
--- 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 2ce842100..8f8ea2222 100644
--- 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()
-- 
2.30.2