diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/atftp | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/atftp')
| -rw-r--r-- | package/atftp/Makefile | 11 | ||||
| -rw-r--r-- | package/atftp/ipkg/atftp.control | 5 | ||||
| -rw-r--r-- | package/atftp/ipkg/atftpd.control | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 5c71f7376..ec903cdf7 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= atftp PKG_VERSION:= 0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 -MASTER_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ +PKG_DESCR:= TFTP client +PKG_SECTION:= net +PKG_DEPENDS:= libreadline libncurses +PKG_URL:= http://freshmeat.net/projects/atftp +PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ +PKG_DESCR_1:= TFTP server include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" CONFIGURE_STYLE= gnu diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control deleted file mode 100644 index 83b1858c4..000000000 --- a/package/atftp/ipkg/atftp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftp -Priority: optional -Section: net -Description: tftp client -Depends: libreadline, libncurses diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control deleted file mode 100644 index 94f49f3f7..000000000 --- a/package/atftp/ipkg/atftpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: atftpd -Priority: optional -Section: net -Description: tftp server -Depends: libreadline, libpcre |