fix0red

6 files changed, 117 insertions, 73 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 062c19bc50a1..64b37a3dab75 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.4 2002/06/03 03:50:36 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.5 2002/06/11 01:01:35 seemant Exp $
+
+*rrdtool-1.0.35-r3 (10 Jun 2002)
+
+  10 Jun 2002; Seemant Kulleen <seemant@gentoo.org> rrdtool-1.0.35-r3.ebuild
+  files/digest-rrdtool-1.0.35-r3 :
+
+  Made fixes so it installs the binaries into /usr/bin and there are also
+  some perl specific things that need to be done (perl was made an optional
+  dep) which are done through the perl-module eclass now.
 
 *rrdtool-1.0.35-r2 (2 Jun 2002)
 	2 Jun 2002; Ben Lutgens <lamer@gentoo.org> rrdtool-1.0.35-r1
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35-r1
deleted file mode 100644
index ce7fcb2cd42f..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5e8975be3ce2dd537a7376919310a3f rrdtool-1.0.35.tar.gz 1126421
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35-r3
index ce7fcb2cd42f..ce7fcb2cd42f 100644
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.35-r3
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.35-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.35-r1.ebuild
deleted file mode 100644
index 7d9dd05a7709..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.35-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.35-r1.ebuild,v 1.1 2002/04/15 11:57:29 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/${P}.tar.gz"
-HOMEPAGE="http://ee-staff.ethz.ca/~oetiker/webtools/rrdtool/"
-
-RDEPEND="sys-devel/perl
-	tcltk? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-		>=media-libs/libgd-1.8.3"
-
-src_compile() {
-
-	local myconf
-	use tcltk \
-		&& myconf="--with-tcllib=/usr/lib" \
-		|| myconf="--without-tcllib"
-
-	./configure \
-		--prefix=/opt/rrdtool \
-		--mandir=/usr/share/man \
-		--with-perl-options='INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3' \
-		${myconf} || die
-
-	make || die
-}
-
-src_install () {
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	make \
-		PREFIX=${D}/usr \
-		site-perl-install || die
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.35-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.35-r3.ebuild
new file mode 100644
index 000000000000..38388ae40489
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.0.35-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.35-r3.ebuild,v 1.1 2002/06/11 01:01:35 seemant Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A system to store and display time-series data"
+SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/${P}.tar.gz"
+HOMEPAGE="http://ee-staff.ethz.ca/~oetiker/webtools/rrdtool/"
+
+RDEPEND="tcltk? ( dev-lang/tcl )"
+
+DEPEND="perl? ( sys-devel/perl )
+	sys-apps/gawk
+	>=media-libs/libgd-1.8.3"
+
+TCLVER=""
+
+pkg_setup() {
+	use tcltk && \
+		TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
+
+	use perl && ( \
+		perl_pkg_setup
+	)
+}
+
+src_compile() {
+
+	local myconf
+	use tcltk \
+		&& myconf="${myconf} --with-tcllib=/usr/lib" \
+		|| myconf="${myconf} --without-tcllib"
+	
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		--enable-shared \
+		--with-perl-options='INSTALLMAN1DIR=/usr/share/man/man1 INSTALLMAN3DIR=/usr/share/man/man3' \
+		${myconf} || die
+
+
+	make || die
+}
+
+src_install () {
+
+	einstall || die
+
+	# this package completely ignores mandir settings
+	
+	doman doc/*.1
+	dohtml doc/*.html
+	dodoc doc/*.pod
+	dodoc doc/*.txt
+	
+	rm -rf ${D}/usr/doc
+	rm -rf ${D}/usr/html
+	rm -rf ${D}/usr/man
+	rm -rf ${D}/usr/contrib
+	rm -rf ${D}/usr/examples
+	
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*
+
+	use perl && ( \
+		perl_perlinfo
+		mytargets="site-perl-install"
+		base_src_install || die
+	)
+
+	use tcltk && ( \
+		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
+		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
+		doins ${S}/tcl/tclrrd${PV}.so
+		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
+			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
+	)
+
+}
+
+
+pkg_preinst() {
+
+	use perl && perl_pkg_preinst
+}
+
+pkg_postinst() {
+	
+	use perl && perl_pkg_postinst
+}
+
+
+pkg_prerm() {
+	
+	use perl && perl_pkg_prerm
+}
+
+
+pkg_postrm() {
+
+	use perl && perl_pkg_postrm
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.35.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.35.ebuild
deleted file mode 100644
index 5507ad0b3120..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.35.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.35.ebuild,v 1.1 2002/03/21 10:57:18 m0rpheus Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A system to store and display time-series data"
-SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/${A}"
-HOMEPAGE="http://ee-staff.ethz.ca/~oetiker/webtools/rrdtool/"
-
-DEPEND="virtual/glibc sys-devel/perl
-        >=media-libs/libgd-1.8.3
-	tcl? ( dev-lang/tcl )"
-
-RDEPEND="virtual/glibc sys-devel/perl tcl? ( dev-lang/tcl )"
-
-src_compile() {
-
-    local myconf
-    use tcl && myconf="--with-tcllib=/usr/lib"
-
-    try ./configure --prefix=/opt/rrdtool ${myconf} --host=${CHOST} --with-perl-options='INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3'
-    try make
-}
-
-src_install () {
-    try make prefix=${D}/opt/rrdtool install
-    try make PREFIX=${D}/usr site-perl-install
-}