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/libdnet | |
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/libdnet')
-rw-r--r-- | package/libdnet/Makefile | 8 | ||||
-rw-r--r-- | package/libdnet/ipkg/libdnet.control | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index f7e53890c..d96404c10 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= libdnet PKG_VERSION:= 1.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 416b765e9d9961501ac85e9a366fd219 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} +PKG_DESCR:= a low-level networking library +PKG_SECTION:= libs +PKG_URL:= http://libdnet.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no @@ -25,6 +28,5 @@ post-install: $(INSTALL_DIR) $(IDIR_LIBDNET)/usr/lib $(INSTALL_DIR) $(IDIR_LIBDNET)/usr/sbin $(CP) $(WRKINST)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ - $(INSTALL_BIN) $(WRKINST)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libdnet/ipkg/libdnet.control b/package/libdnet/ipkg/libdnet.control deleted file mode 100644 index cb7c6ac67..000000000 --- a/package/libdnet/ipkg/libdnet.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdnet -Priority: optional -Section: libs -Description: a low-level networking library |