7 files changed, 5 insertions, 168 deletions
diff --git a/openwrt/package/libnet/Config.in b/openwrt/package/libnet/Config.in
index bcfdc6202..8f8b75957 100644
--- a/openwrt/package/libnet/Config.in
+++ b/openwrt/package/libnet/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_LIBNET
 	select BR2_PACKAGE_LIBPCAP
-	tristate "libnet (a low-level packet creation library)"
+	tristate "libnet"
 	default m
 	help
 	  A low-level packet creation library.
 	  
 	  http://www.packetfactory.net/libnet/
 	  
+	  Depends: libpcap
+	  
 
diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile
index ba5e77731..79b896092 100644
--- a/openwrt/package/libnet/Makefile
+++ b/openwrt/package/libnet/Makefile
@@ -80,9 +80,9 @@ $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built
 	rm -rf $(STAGING_DIR)/usr/lib/libnet.la
 
 $(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNET) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNET) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(IDIR_LIBNET)/usr/lib
-	cp -fp $(STAGING_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
+	cp -fpR $(STAGING_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
 	$(STRIP) $(IDIR_LIBNET)/usr/lib/lib*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR)
diff --git a/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control b/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control
deleted file mode 100644
index 06b23865b..000000000
--- a/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libnet-dev
-Priority: optional
-Section: devel
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/libnet/
-Description: a low-level packet creation library (development)
diff --git a/openwrt/package/libnet/libnet.control b/openwrt/package/libnet/ipkg/libnet.control
index 9b2e53973..9b2e53973 100644
--- a/openwrt/package/libnet/libnet.control
+++ b/openwrt/package/libnet/ipkg/libnet.control
diff --git a/openwrt/package/libnet/ipkg/libnet/CONTROL/control b/openwrt/package/libnet/ipkg/libnet/CONTROL/control
deleted file mode 100644
index 9b2e53973..000000000
--- a/openwrt/package/libnet/ipkg/libnet/CONTROL/control
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: libnet
-Priority: optional
-Section: libs
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/libnet/
-Description: a low-level packet creation library
-Depends: libpcap
diff --git a/openwrt/package/libnet/ipkg/rules b/openwrt/package/libnet/ipkg/rules
deleted file mode 100644
index 6bc215c1b..000000000
--- a/openwrt/package/libnet/ipkg/rules
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(strip ${IPKG_RULES_INC}),)
- include $(IPKG_RULES_INC)
-endif
-
-##
-
-PKG_VERSION := $(shell cat ./ipkg/version)
-CURRENT_DIR := $(shell pwd)
-INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
-
-unexport INSTALL_DIR
-
-I_LIBNET := ipkg/libnet
-I_LIBNET_DEV := ipkg/libnet-dev
-
-BUILD_DEPS := \
-	$(STAGING_DIR)/usr/include/pcap.h \
-
-CONFIGURE_OPTS = \
-	--enable-shared \
-	--enable-static \
-	--with-pf_packet=yes \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
-	touch configure.in
-	touch include.m4
-	touch aclocal.m4
-	touch Makefile.in
-	touch configure
-
-	rm -rf config.cache
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-	ac_libnet_have_pf_packet=yes \
-	ac_cv_lbl_unaligned_fail=no \
-	ac_cv_libnet_endianess=lil \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --program-prefix="" \
-	  --program-suffix="" \
-	  --prefix=/usr \
-	  --exec-prefix=/usr \
-	  --bindir=/usr/bin \
-	  --datadir=/usr/share \
-	  --includedir=/usr/include \
-	  --infodir=/usr/share/info \
-	  --libdir=/usr/lib \
-	  --libexecdir=/usr/lib \
-	  --localstatedir=/var \
-	  --mandir=/usr/share/man \
-	  --sbindir=/usr/sbin \
-	  --sysconfdir=/etc \
-	  $(DISABLE_LARGEFILE) \
-	  $(DISABLE_NLS) \
-	  $(CONFIGURE_OPTS) \
-
-	touch config.guess
-	touch config.sub
-
-	touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
-	$(MAKE) \
-	  $(TARGET_CONFIGURE_OPTS) \
-	  CFLAGS="$(TARGET_CFLAGS)" \
-	  
-	touch .stamp-built
-
-
-$(INSTALL_DIR)/usr/include/libnet.h: .stamp-built
-
-	mkdir -p $(INSTALL_DIR)
-
-	$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 install
-
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/usr/include/libnet.h
-
-
-package: $(INSTALL_DIR)/usr/include/libnet.h
-
-	mkdir -p $(I_LIBNET)/usr/lib
-	cp -fpR $(INSTALL_DIR)/usr/lib/libnet.so.* $(I_LIBNET)/usr/lib/
-	$(STRIP) $(I_LIBNET)/usr/lib/libnet.so.*
-
-	mkdir -p $(I_LIBNET_DEV)/usr/bin
-	cp -fpR $(INSTALL_DIR)/usr/bin/libnet-config $(I_LIBNET_DEV)/usr/bin/
-	mkdir -p $(I_LIBNET_DEV)/usr/include
-	cp -fpR $(INSTALL_DIR)/usr/include/libnet.h $(I_LIBNET_DEV)/usr/include/
-	cp -fpR $(INSTALL_DIR)/usr/include/libnet $(I_LIBNET_DEV)/usr/include/
-	mkdir -p $(I_LIBNET_DEV)/usr/lib
-	cp -fpR $(INSTALL_DIR)/usr/lib/libnet.a $(I_LIBNET_DEV)/usr/lib/
-	cp -fpR $(INSTALL_DIR)/usr/lib/libnet.so* $(I_LIBNET_DEV)/usr/lib/
-
-	chmod 0755 ipkg/*/CONTROL/
-	chmod 0644 ipkg/*/CONTROL/control
-	
-	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
-ifneq ($(strip $(PKG_VERSION)),)
-	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
-endif
-
-	$(IPKG_BUILD) $(I_LIBNET) $(IPKG_TARGET_DIR)
-	$(IPKG_BUILD) $(I_LIBNET_DEV) $(IPKG_TARGET_DIR)
-
-
-clean:
-
-	-$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 uninstall clean
-
-	rm -rf .stamp-* \
-	  $(I_LIBNET)/usr \
-	  $(I_LIBNET_DEV)/usr \
-
-
-control:
-
-	@cat $(I_LIBNET)/CONTROL/control
-	@echo
-	@cat $(I_LIBNET_DEV)/CONTROL/control
-	@echo
-	
-
-.PHONY: configure build install package clean control
diff --git a/openwrt/package/libnet/ipkg/version b/openwrt/package/libnet/ipkg/version
deleted file mode 100644
index afe6924cd..000000000
--- a/openwrt/package/libnet/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.2a-7