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/tcpdump | |
| 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/tcpdump')
| -rw-r--r-- | package/tcpdump/Makefile | 8 | ||||
| -rw-r--r-- | package/tcpdump/ipkg/tcpdump.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 332c9c823..59250a6fb 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -9,14 +9,18 @@ PKG_NAME:= tcpdump PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= b22ca72890df2301d922c9f2d17867f9 -MASTER_SITES:= http://www.tcpdump.org/release/ \ +PKG_DESCR:= A tool for network monitoring and data acquisition. +PKG_SECTION:= net +PKG_DEPENDS:= libpcap +PKG_URL:= http://www.tcpdump.org +PKG_SITES:= http://www.tcpdump.org/release/ \ http://www.sfr-fresh.com/unix/misc/ \ http://www.at.tcpdump.org/ \ http://www.br.tcpdump.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,TCPDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \ diff --git a/package/tcpdump/ipkg/tcpdump.control b/package/tcpdump/ipkg/tcpdump.control deleted file mode 100644 index ca3616976..000000000 --- a/package/tcpdump/ipkg/tcpdump.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: tcpdump -Priority: optional -Section: net -Description: A tool for network monitoring and data acquisition. -Depends: libpcap |