*** empty log message ***import-1.1.1

7 files changed, 251 insertions, 60 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 6b14725ad62f..3d9c8f5e378e 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,166 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mrtg-2.12.2.ebuild:
+  FreeBSD fixes: cp -a -> cp -pPR.
+
+*mrtg-2.12.2 (19 Jun 2005)
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> files/mrtg.rc,
+  -mrtg-2.9.22.ebuild, -mrtg-2.10.14.ebuild, -mrtg-2.10.15.ebuild,
+  -mrtg-2.11.0.ebuild, mrtg-2.11.1.ebuild, mrtg-2.12.1.ebuild,
+  +mrtg-2.12.2.ebuild:
+  Remove old ebuilds, version bump, add configuration message in pkg_postinst
+  and fix utf-8 locales. The last fix was provided by Lars T. Mikkelsen
+  <ltm@mulm.dk> in bug 96535.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on ppc.
+
+*mrtg-2.12.1 (29 May 2005)
+
+  29 May 2005; Aaron Walker <ka0ttic@gentoo.org> +mrtg-2.12.1.ebuild:
+  Version bump.
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mrtg-2.11.1.ebuild:
+  stable on amd64
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on ppc64
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on alpha.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> mrtg-2.11.1.ebuild:
+  Marked stable on x86.
+
+  26 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/mrtg.confd,
+  files/mrtg.rc, mrtg-2.10.14.ebuild, mrtg-2.10.15.ebuild,
+  mrtg-2.11.0.ebuild, mrtg-2.11.1.ebuild:
+  New and improved init script with conf.d config.
+
+*mrtg-2.11.1 (05 Jan 2005)
+
+  05 Jan 2005; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.11.1.ebuild:
+  bump
+
+*mrtg-2.11.0 (08 Dec 2004)
+
+  08 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.11.0.ebuild:
+  bump
+
+  06 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.10.15.ebuild:
+  Stable on alpha.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.10.15.ebuild:
+  ~alpha keyword.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> mrtg-2.10.15.ebuild:
+  Stable on sparc
+
+  05 Sep 2004; <blubb@gentoo.org> mrtg-2.10.15.ebuild:
+  added ~amd64 keyword
+
+  21 Aug 2004; Jason Wever <weeve@gentoo.org> mrtg-2.10.14.ebuild:
+  Stable on sparc.
+
+*mrtg-2.10.15 (08 Aug 2004)
+
+  08 Aug 2004; Martin Holzer <mholzer@gentoo.org> +mrtg-2.10.15.ebuild:
+  Version bumped.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> mrtg-2.10.14.ebuild:
+  stable on ppc64, bug #55550
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> mrtg-2.10.12.ebuild,
+  mrtg-2.10.13.ebuild, mrtg-2.10.14.ebuild:
+  marked x86 stable
+
+  02 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/mrtg.rc,
+  mrtg-2.10.14.ebuild:
+  add init script from Matthew Smith <matthewsmith@iinet.net.au> closing #13839
+
+*mrtg-2.10.14 (08 Jun 2004)
+
+  08 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.10.14.ebuild:
+  version bump
+
+*mrtg-2.10.13 (19 Jan 2004)
+
+  19 Jan 2004; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.13.ebuild:
+  Version bumped.
+
+*mrtg-2.10.12 (05 Jan 2004)
+
+  05 Jan 2004; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.12.ebuild:
+  Version bumped. Closes 37278
+
+*mrtg-2.10.11 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.11.ebuild:
+  Version bumped.
+
+*mrtg-2.10.6 (02 Dec 2003)
+
+  02 Dec 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.6.ebuild:
+  Version bumped.
+
+  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> mrtg-2.9.22.ebuild:
+  Stable on alpha
+
+*mrtg-2.10.5 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.5.ebuild:
+  Version bumped.
+
+  22 May 2003; Christian Birchinger <joker@gentoo.org> mrtg-2.9.29.ebuild:
+  Added sparc stable keyword
+
+*mrtg-2.9.29 (15 Apr 2003)
+
+  12 May 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.9.29.ebuild:
+  Marked x86 stable. 
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.9.29.ebuild:
+  Version bumped. Closes #18309.
+
+*mrtg-2.9.22 (27 Dec 2002)
+
+  09 Jan 2003; Christian Birchinger <joker@gentoo.org> :
+
+  Changed sparc keyword from "~sparc" to "sparc" because Perl 5.8 is now
+  default on sparc and mrtg-2.9.21 has problems with this version.
+
+  27 Dec 2002; Michael Cummings <mcummings@gentoo.org>: mrtg-2.9.22.ebuild:
+
+  Version bump; this one works with perl 5.8, bug 12539
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mrtg-2.9.21 (10 Jul 2002)
+
+  07 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  10 Jul 2002; Kyle Manna <nitro@gentoo.org> mrtg-2.9.17.ebuild mrtg-2.9.21.ebuild:
+
+  Update to latest release. Added slot, keywords, license.
+
+*mrtg-2.9.17 (14 Apr 2002)
+
+  14 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Update to latest release + fix html docs + add the contrib section to the docs.
+
+*mrtg-2.9.7-r1 (11 Apr 2002)
+
+  11 Apr 2002; Spider <spider@gentoo.org> :
+
+  Update libpng dependancy.
 
 *mrtg-2.9.7 (1 Feb 2002)
 
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 851859b6a55c..33dfe20e56d9 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,7 +1,20 @@
-MD5 3f696a8e965b5d8c115894d22a6385c5 ChangeLog 1763
-MD5 f604e15e72d6e776f985d80dd7731664 mrtg-2.9.21.ebuild 1019
-MD5 01f0415ba2a3a2441e8003458e090461 mrtg-2.9.22.ebuild 1019
-MD5 0565f184e3adb56e7b5283bede482d0b mrtg-2.9.29.ebuild 992
-MD5 a891490462eeed790f01ca34ca861ca0 files/digest-mrtg-2.9.21 64
-MD5 b984863c1e7c00e4a0829e901c6cc492 files/digest-mrtg-2.9.22 64
-MD5 0f087b04562f24a41ddb5c5a190f7b33 files/digest-mrtg-2.9.29 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02b8d6c90ee1d15d2e5d5157cbb8574a ChangeLog 5370
+MD5 68c9f31189efe33ed1abae27bad06d29 mrtg-2.11.1.ebuild 1188
+MD5 17c12067590b47925e3c86bf37a4f62b mrtg-2.12.1.ebuild 1194
+MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 aa896196fcc226b0733d421c29d4e5eb mrtg-2.12.2.ebuild 1195
+MD5 3504978d284268fb850a17a8e72ea037 files/digest-mrtg-2.12.1 64
+MD5 a8d246d324b90fd1e37cc912d4651372 files/mrtg.confd 512
+MD5 aff06f9e2832b17c9c558a58472a3091 files/mrtg.rc 1284
+MD5 892b30d2bab4ab965453b5bef89cfecb files/digest-mrtg-2.11.1 64
+MD5 26ac2190042c1cb4fec97a5370c0803d files/digest-mrtg-2.12.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDIIzj5H05b2HAEkRAk7EAJ4uEilLWUGdiYVOQ2yeM0/ridC9UACfR3vF
+x9u9Jk7TchNzwhydIDWT0+w=
+=wN/4
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/mrtg/files/mrtg.confd b/net-analyzer/mrtg/files/mrtg.confd
index f3be157baf08..9b25a0c04822 100644
--- a/net-analyzer/mrtg/files/mrtg.confd
+++ b/net-analyzer/mrtg/files/mrtg.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 MRTG_CONF="/etc/mrtg.conf"
 MRTG_PID="/var/run/mrtg.pid"
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index c04ef8741d9f..b282c73974cb 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,20 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.1 2004/07/03 03:29:25 squinky86 Exp $
-
-# This runscript is for those who want to use the RunAsDaemon:Yes 
-# option for MRTG instead of launching it from a cron job.
-
-
-# Set the following variables for your setup
-
-MRTGPREFIX=/usr/bin
-MRTGCONF=/etc/mrtg.conf
-# pid file defaults to same dir as config file (edit $MRTGPREFIX/mrtg)
-# if you don't like it.
-MRTGPID=/etc/mrtg.pid
- 
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 depend() {
     need net
@@ -24,24 +11,42 @@ depend() {
 }
  
 checkconfig() {
-    if [ ! -f $MRTGCONF ] ; then
-	eerror "Please create $MRTGCONF (try man cfgmaker)"
-	eerror "Make sure you use RunAsDaemon:Yes"
-	return 1
-    fi
-    return 0
+    if [[ ! -f ${MRTG_CONF} ]] ; then
+		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
+		return 1
+	fi
+
+	mrtg --check ${MRTG_CONF}
+	return $?
 }
 
 start() {
-    checkconfig || return $?
-    ebegin "Starting mrtg"
-    start-stop-daemon --start --quiet --pidfile $MRTGPID \
-                --startas $MRTGPREFIX/mrtg $MRTGCONF
-    eend $? "Failed to start mrtg"
+	# mrtg will not run if LANG=*utf8
+	[[ "${LANG}" == *[uU][tT][fF]?8 ]] && LANG='C'
+
+	checkconfig || return $?
+
+	# enable logging?
+	[[ -n "${MRTG_LOG}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
+	
+	# run as a different user?
+	[[ -n "${MRTG_USER}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
+
+	# run as a different group?
+	[[ -n "${MRTG_GROUP}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
+
+	ebegin "Starting mrtg"
+	start-stop-daemon --start --quiet --pidfile ${MRTG_PID} \
+		--exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \
+		${MRTG_OPTS} ${MRTG_CONF} >/dev/null
+	eend $? "Failed to start mrtg"
 }
- 
+
 stop() {
-    ebegin "Stopping mrtg"
-    start-stop-daemon --stop --quiet --pidfile $MRTGPID
-    eend $? "Failed to stop mrtg"
+	ebegin "Stopping mrtg"
+	start-stop-daemon --stop --quiet --pidfile ${MRTG_PID}
+	eend $? "Failed to stop mrtg"
 }
diff --git a/net-analyzer/mrtg/mrtg-2.11.1.ebuild b/net-analyzer/mrtg/mrtg-2.11.1.ebuild
index 0ad2e8ba28e0..70985cf2b54e 100644
--- a/net-analyzer/mrtg/mrtg-2.11.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.1 2005/01/05 23:25:01 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -8,27 +8,34 @@ SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~ppc64 ~amd64 ~alpha"
-IUSE=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="doc"
 
 DEPEND="virtual/libc
 	dev-lang/perl
 	>=media-libs/gd-1.8.4"
 
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
 src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
+	keepdir /var/lib/mrtg
+
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr ${D}/usr/share/doc/mrtg2
+
+	newinitd ${FILESDIR}/mrtg.rc ${PN}
+	newconfd ${FILESDIR}/mrtg.confd ${PN}
+
 	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/*.html images/*
-	exeinto /etc/init.d ; newexe ${FILESDIR}/mrtg.rc mrtg
+
+	if use doc ; then
+		docinto txt ; dodoc doc/*.txt
+		cp -a contrib ${D}/usr/share/doc/${PF}/contrib
+		prepalldocs
+		dohtml -r doc/*.html images/*
+	fi
+}
+
+pkg_postinst(){
+	einfo "You must configure mrtg before being able to run it. Try cfgmaker."
+	einfo "The following thread may be useful:"
+	einfo "http://forums.gentoo.org/viewtopic-t-105862.html"
 }
diff --git a/net-analyzer/mrtg/mrtg-2.12.1.ebuild b/net-analyzer/mrtg/mrtg-2.12.1.ebuild
index f3779a83faf6..ff5ff8192570 100644
--- a/net-analyzer/mrtg/mrtg-2.12.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.1 2005/05/29 00:15:43 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -33,3 +33,9 @@ src_install () {
 		dohtml -r doc/*.html images/*
 	fi
 }
+
+pkg_postinst(){
+	einfo "You must configure mrtg before being able to run it. Try cfgmaker."
+	einfo "The following thread may be useful:"
+	einfo "http://forums.gentoo.org/viewtopic-t-105862.html"
+}
diff --git a/net-analyzer/mrtg/mrtg-2.12.2.ebuild b/net-analyzer/mrtg/mrtg-2.12.2.ebuild
index 715fa3102366..3c3dbdeafc25 100644
--- a/net-analyzer/mrtg/mrtg-2.12.2.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.2.ebuild,v 1.1 2005/06/19 18:24:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.2.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -28,7 +28,7 @@ src_install () {
 
 	if use doc ; then
 		docinto txt ; dodoc doc/*.txt
-		cp -a contrib ${D}/usr/share/doc/${PF}/contrib
+		cp -pPR contrib ${D}/usr/share/doc/${PF}/contrib
 		prepalldocs
 		dohtml -r doc/*.html images/*
 	fi