diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/atftp | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/atftp')
-rw-r--r-- | package/atftp/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 0d4f1407f..866878158 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= atftp PKG_VERSION:= 0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 -PKG_DESCR:= TFTP client -PKG_SECTION:= dhcp +PKG_DESCR:= tftp client +PKG_SECTION:= net/misc PKG_DEPENDS:= libreadline libncurses PKG_BUILDDEP:= readline ncurses PKG_URL:= http://freshmeat.net/projects/atftp/ @@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_LIBC_DEPENDS:= uclibc glibc PKG_SUBPKGS:= ATFTP ATFTPD -PKGSD_ATFTPD:= TFTP server +PKGSD_ATFTPD:= tftp server PKGSS_ATFTPD:= libreadline libncurses include $(TOPDIR)/mk/package.mk |