Revert "Merge branch 'ieee80215' of git@git.openembedded.net:openembedded into ieee80215"

This reverts commit 7eee8a7d69244d34dfa8a7ba709a8e9faeb6c5b2.

3 files changed, 20 insertions, 111 deletions

diff --git a/packages/net-snmp/net-snmp_svn.bb b/packages/net-snmp/net-snmp_svn.bb
index 659b8504c1..2f82865aaa 100644
--- a/packages/net-snmp/net-snmp_svn.bb
+++ b/packages/net-snmp/net-snmp_svn.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "Various tools relating to the Simple Network Management Protocol"
-HOMEPAGE = "http://www.net-snmp.org/"
-LICENSE = "BSD"
-DEPENDS = "openssl"
-RDEPENDS_${PN}-server += "net-snmp-mibs"
-RDEPENDS_${PN}-client += "net-snmp-mibs"
-RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
-RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
+require net-snmp.inc
+DEPENDS += "libtool libtool-native libtool-cross"
 
-PR = "r2"
+PR = "r3"
 S = "${WORKDIR}/net-snmp"
 
 SRC_URI = "svn://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk;rev=17367;module=net-snmp;proto=https \
@@ -15,76 +9,19 @@ SRC_URI = "svn://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk;rev=17367;m
         file://snmpd.conf \
         file://snmptrapd.conf"
 
-inherit autotools update-rc.d
-
 EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \
-                --disable-embedded-perl --with-perl-modules=no"
-EXTRA_OEMAKE = "INSTALL_PREFIX=${D} DESTDIR=${D}"
-
-do_configure() {
-        # Additional flag based on target endiness (see siteinfo.bbclass)
-        ENDIANESS="${@base_conditional('SITEINFO_ENDIANESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}"
-        oenote Determined endianess as: $ENDIANESS
-        oe_runconf $ENDIANESS
-}
-do_install_append() {
-        install -d ${D}${sysconfdir}/snmp
-        install -d ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
-        install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
-        install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-}
-
-do_stage() {
-	    rm -rf ${STAGE_TEMP}
-	    mkdir -p ${STAGE_TEMP}
-	    oe_runmake INSTALL_PREFIX="${STAGE_TEMP}" install
-	    autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
-	    if [ -d ${STAGE_TEMP}/${libdir} ]
-	    then
-    		olddir=`pwd`
-    		cd ${STAGE_TEMP}/${libdir}
-    		las=$(find . -name \*.la -type f)
-    		cd $olddir
-    		echo "Found la files: $las"		 
-    		for i in $las
-    		do
-    			sed -e 's/^installed=yes$/installed=no/' \
-    			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
-    			    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
-    			    -i ${STAGE_TEMP}/${libdir}/$i
-    		done
-    		autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
-    	fi
-        install -d ${STAGING_DIR_HOST}${layout_bindir}
-        sed -e "s@-I/usr/include@@g" \
-            -e "s@^prefix=.*@prefix=${STAING_DIR_HOST}@g" \
-            -e "s@^exec_prefix=.*@exec_prefix=${STAING_DIR_HOST}@g" \
-            -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
-            -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
-                -i net-snmp-config
+                --disable-embedded-perl --with-perl-modules=no GREP=/bin/grep SED=/bin/sed"
+EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
 
-        install -m 755 net-snmp-config ${STAGING_DIR_HOST}${layout_bindir}
-        rm -Rf ${STAGE_TEMP}
+PARALLEL_MAKE = ""
+CCACHE = ""
+
+do_configure_prepend() {
+    gnu-configize -f
+    # We better change sources and re-autoconf here, but
+    # required autoconf is too new for us.
+    sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \
+        -e 's/tail -1/tail -n 1/g'                \
+        -i configure
 }
 
-PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs \
-            net-snmp-mibs net-snmp-server net-snmp-client"
-
-FILES_${PN}-libs = "${libdir}/*"
-FILES_${PN}-mibs = "${datadir}/snmp/mibs"
-FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
-FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
-FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
-FILES_${PN}-dev += ${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update"
-
-CONFFILES_${PN}-server = "${sysconfdir}/snmp/snmpd.conf \
-                          ${sysconfdir}/snmp/snmptrapd.conf"
-
-INITSCRIPT_PACKAGES = "${PN}-server"
-INITSCRIPT_NAME_${PN}-server = "snmpd"
-INITSCRIPT_PARAMS_${PN}-server = "defaults"
-
-LEAD_SONAME = "libnetsnmp.so"
-
-PARALLEL_MAKE = ""
diff --git a/packages/wireshark/tshark_0.99.4.bb b/packages/wireshark/tshark_0.99.4.bb
index 7338efdda7..b7fe2afeed 100644
--- a/packages/wireshark/tshark_0.99.4.bb
+++ b/packages/wireshark/tshark_0.99.4.bb
@@ -1,21 +1,5 @@
 DESCRIPTION = "tshark is the text based verion of wireshark - a popular network protocol analyzer"
-HOMEPAGE = "http://www.ethereal.com"
-SECTION = "network"
-LICENSE = "GPL"
-DEPENDS = "perl-native gnutls libpcap pcre expat"
+require wireshark.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \
-           file://use-our-lemon.patch;patch=1 \
-	   file://no-host-includes.patch;patch=1"
-
-S=${WORKDIR}/wireshark-${PV}
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-wireshark"
-
-do_compile_prepend() {
-	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
-	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
-}
+EXTRA_OECONF = "--disable-wireshark --with-net-snmp=${STAGING_DIR_HOST}${layout_bindir}/net-snmp-config"
 
diff --git a/packages/wireshark/wireshark_0.99.4.bb b/packages/wireshark/wireshark_0.99.4.bb
index e34ca849d4..f4c90fce48 100644
--- a/packages/wireshark/wireshark_0.99.4.bb
+++ b/packages/wireshark/wireshark_0.99.4.bb
@@ -1,21 +1,9 @@
-DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
-HOMEPAGE = "http://www.ethereal.com"
-SECTION = "x11/network"
-LICENSE = "GPL"
-DEPENDS = "perl-native gtk+ gnutls libpcap pcre expat"
+DESCRIPTION = "Wireshark is the world's most popular network protocol analyzer"
+require wireshark.inc
+DEPENDS += "gtk+"
 
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-           file://use-our-lemon.patch;patch=1 \
-	   file://no-host-includes.patch;patch=1"
-
-inherit autotools
-
-do_compile_prepend() {
-	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
-	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
-}
 
 FILES_${PN}-dbg += "${libdir}/wireshark/plugins/${PV}/.debug"