Fix the ntop build and move it out of nonworking.

BKrev: 40b00c32MicH4kOxDATuE_6Gpf9eSA

diff --git a/nonworking/ntop/ntop_2.2c.oe b/nonworking/ntop/ntop_2.2c.oe
deleted file mode 100644 (file)
index 773da57..0000000
--- a/nonworking/ntop/ntop_2.2c.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz
-S = ${WORKDIR}/ntop

diff --git a/nonworking/ntop/ntop_3.0.oe b/nonworking/ntop/ntop_3.0.oe
deleted file mode 100644 (file)
index 32e4e1b..0000000
--- a/nonworking/ntop/ntop_3.0.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "ntop is network top"
-SECTION = "network"
-PRIORITY = "optional"
-DEPENDS = "gdbm zlib libpcap libpng gd"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
-           file://${FILESDIR}/autotools.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF += " --without-ssl \
-                  --with-gd-lib=${STAGING_LIBDIR} \
-                  --with-gd-include=${STAGING_INCDIR} \
-                  --with-zlib-lib=${STAGING_LIBDIR} \
-                  --with-zlib-include=${STAGING_INCDIR} \
-                  --with-pcap-lib=${STAGING_LIBDIR} \
-                  --with-pcap-include=${STAGING_INCDIR} \
-                  --with-libpng-lib=${STAGING_LIBDIR} \
-                  --with-libpng-include=${STAGING_INCDIR} \
-                  --with-gdbm-lib=${STAGING_LIBDIR} \
-                  --with-gdbm-include=${STAGING_INCDIR}"
-
-do_configure () {
-       if [ ! -e acinclude.m4 ]; then
-               mv acinclude.m4.ntop acinclude.m4
-       fi
-       autotools_do_configure
-}

diff --git a/nonworking/ntop/ntop-3.0/autotools.patch b/ntop/ntop-3.0/autotools.patch
similarity index 100%
rename from nonworking/ntop/ntop-3.0/autotools.patch
rename to ntop/ntop-3.0/autotools.patch

diff --git a/ntop/ntop-3.0/plugins.patch b/ntop/ntop-3.0/plugins.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/ntop/ntop_2.2c.oe b/ntop/ntop_2.2c.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/ntop/ntop_3.0.oe b/ntop/ntop_3.0.oe
new file mode 100644 (file)
index 0000000..e69de29