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/ndisc | |
| 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/ndisc')
| -rw-r--r-- | package/ndisc/Makefile | 13 | ||||
| -rw-r--r-- | package/ndisc/ipkg/ndisc6.control | 4 | ||||
| -rw-r--r-- | package/ndisc/ipkg/rdisc6.control | 4 | ||||
| -rw-r--r-- | package/ndisc/ipkg/tcptraceroute6.control | 4 |
4 files changed, 8 insertions, 17 deletions
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index d56bf80e3..8a378af46 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -9,20 +9,23 @@ PKG_NAME:= ndisc6 PKG_VERSION:= 0.9.8 PKG_RELEASE:= 1 PKG_MD5SUM:= cb8d70564b8d40aae95e19592c6be183 -MASTER_SITES:= http://www.remlab.net/files/ndisc6/ +PKG_DESCR:= ICMPv6 Neighbour Discovery tools +PKG_SECTION:= net +PKG_URL:= http://www.remlab.net +PKG_SITES:= http://www.remlab.net/files/ndisc6/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" -TCLFAGS+= -std=c99 post-install: ${INSTALL_DIR} ${IDIR_NDISC6}/usr/bin diff --git a/package/ndisc/ipkg/ndisc6.control b/package/ndisc/ipkg/ndisc6.control deleted file mode 100644 index 40b935e91..000000000 --- a/package/ndisc/ipkg/ndisc6.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ndisc6 -Priority: optional -Section: net -Description: ICMPv6 Neighbour Discovery tool diff --git a/package/ndisc/ipkg/rdisc6.control b/package/ndisc/ipkg/rdisc6.control deleted file mode 100644 index 4724d6914..000000000 --- a/package/ndisc/ipkg/rdisc6.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: rdisc6 -Priority: optional -Section: net -Description: ICMPv6 Router Discovery tool diff --git a/package/ndisc/ipkg/tcptraceroute6.control b/package/ndisc/ipkg/tcptraceroute6.control deleted file mode 100644 index 625fe80c1..000000000 --- a/package/ndisc/ipkg/tcptraceroute6.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: tcptraceroute6 -Priority: optional -Section: net -Description: A TCP/IPv6-based traceroute implementation |