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/fprobe | |
| 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/fprobe')
| -rw-r--r-- | package/fprobe/Makefile | 8 | ||||
| -rw-r--r-- | package/fprobe/ipkg/fprobe.control | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 959c9a119..53691c108 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= fprobe PKG_VERSION:= 1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2 +PKG_DESCR:= NetFlow probe +PKG_SECTION:= net +PKG_DEPENDS:= libpcap libpthread +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-piddir=/var \ diff --git a/package/fprobe/ipkg/fprobe.control b/package/fprobe/ipkg/fprobe.control deleted file mode 100644 index 97763667c..000000000 --- a/package/fprobe/ipkg/fprobe.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: fprobe -Priority: optional -Section: net -Depends: libpcap, libpthread -Description: NetFlow probe - libpcap-based tool that collect network traffic data - and emit it as NetFlow flows towards the specified collector |