FHS compliance changes.

3 files changed, 13 insertions, 10 deletions

diff --git a/net-analyzer/ucd-snmp/ChangeLog b/net-analyzer/ucd-snmp/ChangeLog
index 4e245fc4a501..dcb0588559ae 100644
--- a/net-analyzer/ucd-snmp/ChangeLog
+++ b/net-analyzer/ucd-snmp/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for net-analyzer/ucd-snmp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ChangeLog,v 1.10 2003/02/18 19:47:52 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ChangeLog,v 1.11 2003/02/19 05:24:42 raker Exp $
 
   18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/snmpd.rc6 :
-  Updated the location of the example configuration.
+  Changed the location of snmpd.conf to /etc/ucd-snmp for FHS 
+  compliance and put an snmpd.conf.dist in the directory.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-analyzer/ucd-snmp/files/snmpd.rc6 b/net-analyzer/ucd-snmp/files/snmpd.rc6
index 68c75016790c..6d270049f86a 100644
--- a/net-analyzer/ucd-snmp/files/snmpd.rc6
+++ b/net-analyzer/ucd-snmp/files/snmpd.rc6
@@ -1,16 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/files/snmpd.rc6,v 1.5 2003/02/18 19:47:52 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/files/snmpd.rc6,v 1.6 2003/02/19 05:24:42 raker Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /usr/share/snmp/snmpd.conf ] ; then
-		eerror "You need an /usr/share/snmp/snmpd.conf to run ucd-snmpd"
-		eerror "There is an example config in /usr/share/docs/ucd-snmp-4.2.6/EXAMPLE.conf"
+	if [ ! -e /etc/ucd-snmp/snmpd.conf ] ; then
+		eerror "You need an /etc/ucd-snmp/snmpd.conf to run ucd-snmpd"
+		eerror "There is an example config in /etc/ucd-snmp/snmpd.conf.dist"
 		return 1
 	fi
 }
diff --git a/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild b/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild
index 4bb4449e20c3..6f4b8fcba9ec 100644
--- a/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild
+++ b/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild,v 1.4 2003/02/13 13:52:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ucd-snmp-4.2.6.ebuild,v 1.5 2003/02/19 05:24:42 raker Exp $
 
 IUSE="ssl ipv6 tcpd"
-
 S=${WORKDIR}/${P}
 DESCRIPTION="Software for generating and retrieving SNMP data"
 SRC_URI="mirror://sourceforge/net-snmp/${P}.tar.gz"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
-
 DEPEND="<sys-libs/db-2
 	>=sys-libs/zlib-1.1.4
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 sparc ~ppc"
 
 src_compile() {
+	export SNMPCONFPATH="/etc/ucd-snmp"
 	local myconf
 	use ssl || myconf="${myconf} --enable-internal-md5 --with-openssl=no"
 	use tcpd && myconf="${myconf} --with-libwrap"
@@ -50,4 +48,8 @@ src_install () {
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/snmpd.rc6 snmpd
+
+	dodir /etc/ucd-snmp
+	insinto /etc/ucd-snmp
+	newins EXAMPLE.conf snmpd.conf.dist
 }