vsftpd: Cleanup Makefile

[openwrt/svn-archive/archive.git] / net / vsftpd / Makefile

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 174f1eea95d4676fb88595c056a0a98ca517fa45..051281bc597af5a879b4bfe69dfdf5a6c139b1fe 100644 (file)
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
-PKG_VERSION:=2.0.4
-PKG_RELEASE:=1
+PKG_VERSION:=2.0.5
+PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
-PKG_MD5SUM:=c0bf8c7b8e15ab15827172786fc56115
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=146062e8b2f93af43ff6c2c770feea94
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +22,6 @@ define Package/vsftpd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A fast and secure FTP server
-  DESCRIPTION:=A fast and secure FTP server.
   URL:=http://vsftpd.beasts.org/
 endef
 
@@ -34,26 +29,13 @@ define Package/vsftpd/conffiles
 /etc/vsftpd.conf
 endef
 
-define Build/Configure
-endef
-
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               vsftpd install
-endef
-
 define Package/vsftpd/install
-       install -d -m0755 $(1)/etc
-       install -m0644 ./files/vsftpd.conf $(1)/etc/vsftpd.conf
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/vsftpd.init $(1)/etc/init.d/vsftpd
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/vsftpd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) ./files/vsftpd.conf $(1)/etc/vsftpd.conf
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/vsftpd.init $(1)/etc/init.d/vsftpd
 endef
 
 $(eval $(call BuildPackage,vsftpd))