diff options
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/rrdtool/ChangeLog | 11 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/digest-rrdtool-1.0.45 | 1 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/digest-rrdtool-1.0.46 | 1 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/digest-rrdtool-1.0.49 | 1 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch | 26 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.0.49-fPIC.patch (renamed from net-analyzer/rrdtool/files/rrdtool-1.0.46-fPIC.patch) | 0 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.0.45.ebuild | 105 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.0.49.ebuild (renamed from net-analyzer/rrdtool/rrdtool-1.0.46.ebuild) | 51 |
9 files changed, 32 insertions, 166 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index 24a77db0c277..4f05647b661a 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/rrdtool # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.39 2004/08/05 22:19:16 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.40 2004/08/10 02:05:02 squinky86 Exp $ + +*rrdtool-1.0.49 (09 Aug 2004) + + 09 Aug 2004; Jon Hood <squinky86@gentoo.org> + -files/rrdtool-1.0.46-fPIC.patch, -files/rrdtool-1.0.46-tcl.patch, + +files/rrdtool-1.0.49-fPIC.patch, -rrdtool-1.0.45.ebuild, + -rrdtool-1.0.46.ebuild, +rrdtool-1.0.49.ebuild: + Version bump, closes #59851, thanks Haroon Rafique + <corporate_gadfly@hotmail.com>; ebuild cleanups. *rrdtool-1.0.48 (05 Aug 2004) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index acfd6c20c18f..a073e5cb0065 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,3 +1,4 @@ +MD5 dff4d347ba85f650a49f193d9d916e9b rrdtool-1.0.49.ebuild 2544 MD5 e4acce78bdbb0d39318cff50a1da1661 rrdtool-1.0.46.ebuild 2759 MD5 dff4d347ba85f650a49f193d9d916e9b rrdtool-1.0.48.ebuild 2544 MD5 dc14bf81b27063da73b71cf7163ce1c4 rrdtool-1.0.45.ebuild 2276 @@ -12,6 +13,7 @@ MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45 67 MD5 dbfa1a58afba8beb1930edc01f37f908 files/digest-rrdtool-1.0.46 67 MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67 MD5 f258771c66239d553cf011c9874a50b1 files/digest-rrdtool-1.0.48 67 +MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67 MD5 97610425876ad7e680316d1a3e808c4b files/digest-rrdtool-1.0.40-r1 67 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67 MD5 0375bc1ad29af2bbb7fc1782eef03896 files/rrdtool-1.0.46-tcl.patch 1170 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45 deleted file mode 100644 index 4a703fa78f96..000000000000 --- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45 +++ /dev/null @@ -1 +0,0 @@ -MD5 64086fc7f1ca28c069ee5104f85d7a8c rrdtool-1.0.45.tar.gz 1176656 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46 deleted file mode 100644 index 4915bd9fff2f..000000000000 --- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46 +++ /dev/null @@ -1 +0,0 @@ -MD5 718676770c06b25d1471cec1e4f0bbdc rrdtool-1.0.46.tar.gz 1459768 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49 new file mode 100644 index 000000000000..0b8aa7e2483d --- /dev/null +++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49 @@ -0,0 +1 @@ +MD5 fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz 1466897 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch b/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch deleted file mode 100644 index ccd2c086c014..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- rrdtool-1.0.46.orig/tcl/Makefile.am 2003-12-01 06:01:14.000000000 +0800 -+++ rrdtool-1.0.46/tcl/Makefile.am 2004-03-09 12:07:43.000000000 +0800 -@@ -22,7 +22,7 @@ - if COMP_TCL - - $(TCL_LIB_FILE): tclrrd.o -- $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC) -+ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC) - - tclrrd.o: tclrrd.c - $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\" ---- rrdtool-1.0.46.orig/tcl/Makefile.in 2004-01-04 20:40:54.000000000 +0800 -+++ rrdtool-1.0.46/tcl/Makefile.in 2004-03-09 12:42:16.000000000 +0800 -@@ -320,10 +320,10 @@ - - - @COMP_TCL_TRUE@$(TCL_LIB_FILE): tclrrd.o --@COMP_TCL_TRUE@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC) -+@COMP_TCL_TRUE@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC) - - @COMP_TCL_TRUE@tclrrd.o: tclrrd.c --@COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\" -+@COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -I$(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\" - - @COMP_TCL_TRUE@all-local: $(TCL_LIB_FILE) - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.0.46-fPIC.patch b/net-analyzer/rrdtool/files/rrdtool-1.0.49-fPIC.patch index 2e740dbdaf07..2e740dbdaf07 100644 --- a/net-analyzer/rrdtool/files/rrdtool-1.0.46-fPIC.patch +++ b/net-analyzer/rrdtool/files/rrdtool-1.0.49-fPIC.patch diff --git a/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild deleted file mode 100644 index 0982dec50bdf..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45.ebuild,v 1.11 2004/07/14 22:33:24 agriffis Exp $ - -inherit perl-module flag-o-matic gnuconfig - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/" -SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64" -IUSE="tcltk perl" - -DEPEND="perl? ( dev-lang/perl ) - sys-apps/gawk - >=media-libs/gd-1.8.3" -RDEPEND="tcltk? ( dev-lang/tcl )" - -TCLVER="" - -pkg_setup() { - if use tcltk; then - TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh` - fi - - if use perl; then - perl-module_pkg_setup - fi -} - -src_compile() { - filter-mfpmath "sse" - filter-flags "-ffast-math" - - local myconf - use tcltk \ - && myconf="${myconf} --with-tcllib=/usr/lib" \ - || myconf="${myconf} --without-tcllib" - - gnuconfig_update - - econf \ - --datadir=/usr/share \ - --enable-shared \ - --with-perl-options='INSTALLMAN1DIR=/usr/share/man/man1 INSTALLMAN3DIR=/usr/share/man/man3 PREFIX=${D}/usr' \ - ${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/* - - if use perl ; then - perlinfo - mytargets="site-perl-install" - perl-module_src_install || die - fi - - if use tcltk ; then - 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 - fi - - dodoc COPY* CONTR* README TODO -} - -pkg_preinst() { - use perl && perl-module_pkg_preinst -} - -pkg_postinst() { - use perl && perl-module_pkg_postinst -} - -pkg_prerm() { - use perl && perl-module_pkg_prerm -} - -pkg_postrm() { - use perl && perl-module_pkg_postrm -} diff --git a/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild index c226f77b7eaa..478b1ce9dd0e 100644 --- a/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild,v 1.7 2004/07/14 22:33:24 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.1 2004/08/10 02:05:02 squinky86 Exp $ inherit perl-module flag-o-matic gnuconfig eutils @@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64" IUSE="perl tcltk" DEPEND="perl? ( dev-lang/perl ) @@ -21,10 +21,6 @@ RDEPEND="tcltk? ( dev-lang/tcl )" TCLVER="" pkg_setup() { - if use tcltk ; then - TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh` - fi - if use perl ; then perl-module_pkg_setup fi @@ -32,8 +28,6 @@ pkg_setup() { src_unpack() { unpack ${A} - epatch ${FILESDIR}/${P}-tcl.patch # 1.0.46 has a broke TCL Makefile - cd ${S} epatch ${FILESDIR}/${P}-fPIC.patch } @@ -43,34 +37,24 @@ src_compile() { filter-flags -ffast-math local myconf + myconf="${myconf} --datadir=/usr/share --enable-shared" + use tcltk \ && myconf="${myconf} --with-tcllib=/usr/lib" \ || myconf="${myconf} --without-tcllib" - if use perl ; then - MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'` - if [ "${MMSIXELEVEN}" ]; then - econf \ - --datadir=/usr/share \ - --enable-shared \ - --with-perl-options='INSTALLDIRS=vendor destdir=${D}/' \ - ${myconf} || die - - else - econf \ - --datadir=/usr/share \ - --enable-shared \ - --with-perl-options='PREFIX=${D}/usr INSTALLDIRS=vendor' \ - ${myconf} || die - fi + if use perl; then + econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed" + + # libraries without -fPIC? feh! + for libdir in cgilib* gd* libpng* zlib*; do + sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile + done else - econf \ - --datadir=/usr/share \ - --enable-shared \ - ${myconf} || die + econf ${myconf} || die "econf failed" fi - make || die + make || die "make failed" } src_install() { @@ -98,12 +82,15 @@ src_install() { perlinfo mytargets="site-perl-install" perl-module_src_install || die + + # remove duplicate installation into /usr/lib/perl + rm -Rf ${D}/usr/lib/perl fi if use tcltk ; then - mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so - insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV} - doins ${S}/tcl/tclrrd${PV}.so +# 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 fi |