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/iptraf | |
| 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/iptraf')
| -rw-r--r-- | package/iptraf/Makefile | 8 | ||||
| -rw-r--r-- | package/iptraf/ipkg/iptraf.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index f56a89d4c..5fc36418d 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= iptraf PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 -MASTER_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ +PKG_DESCR:= A console-based network monitoring program. +PKG_SECTION:= net +PKG_DEPENDS:= libncurses +PKG_URL:= http://iptraf.seul.org +PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPTRAF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: ${MAKE} -C ${WRKBUILD}/src \ diff --git a/package/iptraf/ipkg/iptraf.control b/package/iptraf/ipkg/iptraf.control deleted file mode 100644 index 840c9d1e0..000000000 --- a/package/iptraf/ipkg/iptraf.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptraf -Priority: optional -Section: net -Depends: libncurses -Description: A console-based network monitoring program. |