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/netstat-nat | |
| 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/netstat-nat')
| -rw-r--r-- | package/netstat-nat/Makefile | 7 | ||||
| -rw-r--r-- | package/netstat-nat/ipkg/netstat-nat.control | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index 16f960f01..9a32909b8 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= netstat-nat PKG_VERSION:= 1.4.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 45e8d0f47623f619c22a6b894cd03cbc -MASTER_SITES:= http://www.tweegy.nl/download/ +PKG_DESCR:= a netstat variant for NAT connections +PKG_SECTION:= net +PKG_URL:= http://www.tweegy.nl/projects/netstat-nat/index.html +PKG_SITES:= http://www.tweegy.nl/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,NETSTAT_NAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/netstat-nat/ipkg/netstat-nat.control b/package/netstat-nat/ipkg/netstat-nat.control deleted file mode 100644 index dea7d633d..000000000 --- a/package/netstat-nat/ipkg/netstat-nat.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: netstat-nat -Priority: optional -Section: net -Description: a netstat variant for NAT connections - Netstat-nat displays NAT connections, managed by netfilter/iptables which - comes with the > 2.4.x linux kernels. - |