packages/remotefs: remove dependencies on libc & libgcc, fix conffiles

[packages.git] / net / netatalk / Makefile

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 9b24156..5aa5d08 100644 (file)
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
-PKG_VERSION:=2.1.3
-PKG_RELEASE:=1
-PKG_SOURCE:=netatalk-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/netatalk/
+PKG_VERSION:=2.2.1
+PKG_RELEASE:=3
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/netatalk
+PKG_MD5SUM:=4a371025daf96adb73fa491efdbfef28
+
 PKG_BUILD_PARALLEL:=1
-PKG_MD5SUM:=785e287f5b5e5c9cce9397f9bce02a22
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netatalk
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libdb47 +libgcrypt +libopenssl
+  SUBMENU:=Filesystem
+  DEPENDS:=+libdb47 +libgcrypt +libopenssl $(LIBRPC_DEPENDS)
   TITLE:=netatalk
   URL:=http://netatalk.sourceforge.net
   MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -32,10 +37,12 @@ define Package/netatalk/decription
   Protocol Suite.
 endef
 
-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include
+define Package/netatalk/conffiles
+/etc/netatalk/afpd.conf
+endef
 
-CONFIGURE_VARS += \
-       CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -DNO_DEBUG "
+TARGET_CFLAGS += -std=gnu99 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+TARGET_LDFLAGS += $(LIBRPC)
 
 CONFIGURE_ARGS += \
        --disable-afs \
@@ -53,18 +60,23 @@ CONFIGURE_ARGS += \
        --with-uams-path="/usr/lib/uams" \
        --disable-admin-group \
        --disable-srvloc \
+       --disable-zeroconf \
+       --without-shadow \
+       --without-ldap
 
 define Package/netatalk/install
-       $(INSTALL_DIR) $(1)/usr/sbin/
-       $(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/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/lib/uams
+       $(INSTALL_DIR) $(1)/etc/netatalk
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/afppasswd $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/afpd $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/
+       $(CP) ./files/AppleVolumes.default $(1)/etc/netatalk/
+       $(CP) $(PKG_INSTALL_DIR)/etc/netatalk/AppleVolumes.system $(1)/etc/netatalk/
        $(INSTALL_CONF) ./files/afpd.conf $(1)/etc/netatalk/
        $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd
 endef