net-snmp 5.4.1: Minor updates:

 - Disable perl as it does not build with it enabled
 - The CONFFILES apply to all distros, not just one of them
 - Use the update-rc.d bbclass
 - Run libtoolize to get all the shard libraries to build/install
 - Set LEAD_SONAME since there are several .so files
 - Style cleanups

1 files changed, 38 insertions, 46 deletions

diff --git a/packages/net-snmp/net-snmp_5.4.1.bb b/packages/net-snmp/net-snmp_5.4.1.bb
index 8e5449c0dc..0fc36d3ff3 100644
--- a/packages/net-snmp/net-snmp_5.4.1.bb
+++ b/packages/net-snmp/net-snmp_5.4.1.bb
@@ -1,62 +1,54 @@
 DESCRIPTION = "Various tools relating to the Simple Network Management Protocol"
 HOMEPAGE = "http://www.net-snmp.org/"
 LICENSE = "BSD"
-DEPENDS = "openssl perl"
-RDEPENDS = "perl-lib"
-PR = "r0"
+DEPENDS = "openssl"
+RDEPENDS_${PN}-server += "net-snmp-mibs"
+RDEPENDS_${PN}-client += "net-snmp-mibs"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
-	file://configure-tail.patch;patch=1 \
-	file://init \
-	file://snmpd.conf \
-	file://snmptrapd.conf"
+        file://configure-tail.patch;patch=1 \
+        file://init \
+        file://snmpd.conf \
+        file://snmptrapd.conf"
 
-inherit autotools
+inherit autotools update-rc.d
 
-PARALLEL_MAKE = ""
-EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults"
+EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \
+                --disable-embedded-perl --with-perl-modules=no"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${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
+        # 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
+        libtoolize --force
+        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/
+        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/
 }
 
-PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs net-snmp-mibs net-snmp-server net-snmp-client"
-FILES_net-snmp-libs = "${libdir}/*"
-FILES_net-snmp-mibs = "${datadir}/snmp/mibs"
-FILES_net-snmp-server = "${sbindir}/* ${sysconfdir}"
-FILES_net-snmp-client = "${bindir}/* ${datadir}/snmp/"
-FILES_net-snmp-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
-RDEPENDS_net-snmp-server += "net-snmp-mibs"
-RDEPENDS_net-snmp-client += "net-snmp-mibs"
-
-pkg_postinst_net-snmp-server() {
-if test "x$D" != "x"; then
-	D="-r $D"
-else
-	D="-s"
-fi
-update-rc.d $D snmpd defaults
-}
+PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs \
+            net-snmp-mibs net-snmp-server net-snmp-client"
 
-pkg_postrm_net-snmp-server() {
-if test "x$D" != "x"; then
-	D="-r $D"
-else
-	/etc/init.d/snmpd stop
-fi
-update-rc.d $D snmpd remove
-}
+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/"
 
-CONFFILES_${PN}_nylon = "${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/snmp/snmptrapd.conf"
+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 = ""