X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fatftp%2FMakefile;h=f31c5fe620a40d70e4c20e831204b18ce60f6d21;hp=3042711f6df40d42f5109035bb5d2d715911aec9;hb=eadf61eaa07320ca7ab2c187fb9e56c17be15592;hpb=aad785e5f48e14d5cdf9280fce4e76e07db62319

diff --git a/net/atftp/Makefile b/net/atftp/Makefile
index 3042711f6d..f31c5fe620 100644
--- a/net/atftp/Makefile
+++ b/net/atftp/Makefile
@@ -1,74 +1,70 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atftp
 PKG_VERSION:=0.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82
 
-PKG_SOURCE_URL:=ftp://ftp.mamalinux.com/pub/atftp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
+PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DEPENDS:=libncurses libpcre libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/atftp
+define Package/atftp/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libreadline +libpcre
-  MENU:=1
-  TITLE:=TFTP client
-  DESCRIPTION:=TFTP client
-  URL:=ftp://ftp.mamalinux.com/pub/atftp/
+  TITLE:=TFTP
+  SUBMENU:=File Transfer
+endef
+
+define Package/atftp
+  $(call Package/atftp/Default)
+  DEPENDS:=+libreadline +libncurses
+  TITLE+= client
 endef
 
 define Package/atftpd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=atftp +libreadline +libpcre
-  TITLE:=TFTP server
-  DESCRIPTION:=TFTP server
-  URL:=ftp://ftp.mamalinux.com/pub/atftp/
+  $(call Package/atftp/Default)
+  DEPENDS:=+libpcre +libpthread
+  TITLE+= server
 endef
 
 define Package/atftpd/postinst
 #!/bin/sh
-grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
-if [ $? -ne 0 ]; then
-	echo "tftp            69/tcp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp            69/udp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp-mcast    1758/tcp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp-mcast    1758/udp" >>${IPKG_INSTROOT}/etc/services
+grep -q '^tftp[[:space:]]*69/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
+if [ $$? -ne 0 ]; then
+	echo "tftp            69/tcp" >>$${IPKG_INSTROOT}/etc/services
+	echo "tftp            69/udp" >>$${IPKG_INSTROOT}/etc/services
+	echo "tftp-mcast    1758/tcp" >>$${IPKG_INSTROOT}/etc/services
+	echo "tftp-mcast    1758/udp" >>$${IPKG_INSTROOT}/etc/services
 fi
 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) -Wall -D_REENTRANT" \
-		DESTDIR=$(PKG_INSTALL_DIR) \
-		all install
-endef
+CONFIGURE_ARGS += \
+	--disable-libwrap 
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \
+	all
 
 define Package/atftp/install
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin/
 endef
 
 define Package/atftpd/install
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,atftp))