20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
authorYamei Feng <yamei.feng@oracle.com>
Wed, 06 May 2015 15:27:49 -0700
changeset 4250 80b910c051fc
parent 4248 7b59b5b80fb0
child 4251 2bf7e2c1ca74
20839711 Upgrade rrdtool from 1.4.3 to 1.4.9
components/rrdtool/Makefile
components/rrdtool/patches/rrdtool.bindings.lua.rrdlua.c.patch
components/rrdtool/patches/rrdtool.configure.ac.patch
components/rrdtool/rrdtool.p5m
--- a/components/rrdtool/Makefile	Thu Apr 30 04:31:45 2015 -0700
+++ b/components/rrdtool/Makefile	Wed May 06 15:27:49 2015 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         rrdtool
-COMPONENT_VERSION=      1.4.3
+COMPONENT_VERSION=      1.4.9
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
+COMPONENT_ARCHIVE_HASH= sha256:3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc
 COMPONENT_ARCHIVE_URL=  http://oss.oetiker.ch/rrdtool/pub/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=  http://oss.oetiker.ch/rrdtool/
 COMPONENT_BUGDB=        utility/rrdtool
-TPNO=                   9344
+TPNO=                   21430 
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/rrdtool/patches/rrdtool.bindings.lua.rrdlua.c.patch	Thu Apr 30 04:31:45 2015 -0700
+++ b/components/rrdtool/patches/rrdtool.bindings.lua.rrdlua.c.patch	Wed May 06 15:27:49 2015 -0700
@@ -1,7 +1,7 @@
 # Copied over from the desktop consolidation, not for upstream
 
---- rrdtool-1.4.3/bindings/lua/rrdlua.c 2014-02-03 13:17:19.604959810 +0530
-+++ rrdtool-1.4.3/bindings/lua/rrdlua.c 2014-02-03 13:18:21.442352916 +0530
+--- rrdtool-1.4.9/bindings/lua/rrdlua.c Wed Apr 15 15:28:08 2015 
++++ rrdtool-1.4.9/bindings/lua/rrdlua.c Wed Apr 15 15:30:12 2015 
 @@ -342,7 +342,7 @@
  
  /**********************************************************/
--- a/components/rrdtool/patches/rrdtool.configure.ac.patch	Thu Apr 30 04:31:45 2015 -0700
+++ b/components/rrdtool/patches/rrdtool.configure.ac.patch	Wed May 06 15:27:49 2015 -0700
@@ -3,9 +3,9 @@
 # The last two changes are copied from Desktop consolidation,
 # not for upstream
 
---- rrdtool-1.4.3/configure.ac     2014-02-03 15:33:25.524125781 +0530
-+++ rrdtool-1.4.3/configure.ac     2015-02-06 15:34:40.410120677 +0530
[email protected]@ -544,8 +544,6 @@ PERL_VERSION
+--- rrdtool-1.4.9/configure.ac 	Wed Apr 15 15:32:19 2015
++++ rrdtool-1.4.9/configure.ac 	Wed Apr 15 16:32:20 2015
[email protected]@ -555,8 +555,6 @@ PERL_VERSION
  CONFIGURE_PART(Prep for Building Language Bindings)
    
  dnl Check for Perl and friends
@@ -14,16 +14,16 @@
  AC_PATH_PROG(PERL, perl, no)
  AC_PATH_PROG(POD2MAN, pod2man, no)
  AC_PATH_PROG(POD2HTML, pod2html, no)
[email protected]@ -596,7 +594,7 @@ PERL_SETUP
[email protected]@ -607,7 +605,7 @@ PERL_SETUP
  test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix
  test "$langpref" = "NONE" && langpref=$ac_default_prefix
  
--PERL_MAKE_OPTIONS="PREFIX=$langpref LIB=$langpref/lib/perl/$PERL_VERSION"
+-PERL_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/perl/$PERL_VERSION"
 +PERL_MAKE_OPTIONS="PREFIX=$langpref"
  
  dnl pass additional perl options when generating Makefile from Makefile.PL
  AC_ARG_ENABLE(perl-site-install,
[email protected]@ -618,6 +616,22 @@ PERL_SETUP
[email protected]@ -629,6 +627,22 @@ PERL_SETUP
     if test ! -z "$PERLLDFLAGS"; then
         PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LDFLAGS=$PERLLDFLAGS"
     fi
@@ -46,7 +46,7 @@
  fi
          
  AC_ARG_WITH(perl-options,
[email protected]@ -725,8 +739,15 @@ LUA_EOF
[email protected]@ -736,8 +750,15 @@ LUA_EOF
        LIBS=
        lua_havelib=no
        LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
@@ -64,7 +64,7 @@
            [lua_havelib=LUA$lua_vndot],
            [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
              [lua_havelib=$lua_vndot; $LUA -l compat-5.1 2>/dev/null;
[email protected]@ -763,7 +784,12 @@ LUA_SETUP
[email protected]@ -774,7 +795,12 @@ LUA_SETUP
            done
          fi
  
--- a/components/rrdtool/rrdtool.p5m	Thu Apr 30 04:31:45 2015 -0700
+++ b/components/rrdtool/rrdtool.p5m	Wed May 06 15:27:49 2015 -0700
@@ -29,7 +29,7 @@
 set name=pkg.description \
     value="RRDtool, Round Robin Database tool, is a data analysis tool for generating graphical representations"
 set name=com.oracle.info.description value="RRDtool, Round Robin Database tool"
-set name=com.oracle.info.tpno value=9344
+set name=com.oracle.info.tpno value=21430
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -43,22 +43,20 @@
 file path=usr/include/rrd.h
 file path=usr/include/rrd_client.h
 file path=usr/include/rrd_format.h
-link path=usr/lib/$(MACH64)/librrd.so target=librrd.so.4.1.3
-link path=usr/lib/$(MACH64)/librrd.so.4 target=librrd.so.4.1.3
-file path=usr/lib/$(MACH64)/librrd.so.4.1.3
-link path=usr/lib/$(MACH64)/librrd_th.so target=librrd_th.so.4.1.3
-link path=usr/lib/$(MACH64)/librrd_th.so.4 target=librrd_th.so.4.1.3
-file path=usr/lib/$(MACH64)/librrd_th.so.4.1.3
+link path=usr/lib/$(MACH64)/librrd.so target=librrd.so.4.2.2
+link path=usr/lib/$(MACH64)/librrd.so.4 target=librrd.so.4.2.2
+file path=usr/lib/$(MACH64)/librrd.so.4.2.2
+link path=usr/lib/$(MACH64)/librrd_th.so target=librrd_th.so.4.2.2
+link path=usr/lib/$(MACH64)/librrd_th.so.4 target=librrd_th.so.4.2.2
+file path=usr/lib/$(MACH64)/librrd_th.so.4.2.2
 file path=usr/lib/$(MACH64)/pkgconfig/librrd.pc
-file path=usr/lib/$(MACH64)/rrdtool/ifOctets.tcl
-file path=usr/lib/$(MACH64)/rrdtool/pkgIndex.tcl
 file path=usr/lib/$(MACH64)/tclrrd$(COMPONENT_VERSION).so
-link path=usr/lib/librrd.so target=librrd.so.4.1.3
-link path=usr/lib/librrd.so.4 target=librrd.so.4.1.3
-file path=usr/lib/librrd.so.4.1.3
-link path=usr/lib/librrd_th.so target=librrd_th.so.4.1.3
-link path=usr/lib/librrd_th.so.4 target=librrd_th.so.4.1.3
-file path=usr/lib/librrd_th.so.4.1.3
+link path=usr/lib/librrd.so target=librrd.so.4.2.2
+link path=usr/lib/librrd.so.4 target=librrd.so.4.2.2
+file path=usr/lib/librrd.so.4.2.2
+link path=usr/lib/librrd_th.so target=librrd_th.so.4.2.2
+link path=usr/lib/librrd_th.so.4 target=librrd_th.so.4.2.2
+file path=usr/lib/librrd_th.so.4.2.2
 link path=usr/lib/lua/5.2/64/rrd.so target=rrd.so.0.0.0
 link path=usr/lib/lua/5.2/64/rrd.so.0 target=rrd.so.0.0.0
 file path=usr/lib/lua/5.2/64/rrd.so.0.0.0
@@ -66,8 +64,6 @@
 link path=usr/lib/lua/5.2/rrd.so.0 target=rrd.so.0.0.0
 file path=usr/lib/lua/5.2/rrd.so.0.0.0
 file path=usr/lib/pkgconfig/librrd.pc
-file path=usr/lib/rrdtool/ifOctets.tcl
-file path=usr/lib/rrdtool/pkgIndex.tcl
 file path=usr/lib/tclrrd$(COMPONENT_VERSION).so
 file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/RRDs.pm
 file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDp/.packlist
@@ -216,4 +212,6 @@
 file path=usr/share/rrdtool/examples/rrdcached/rrdcached-size.pl
 file path=usr/share/rrdtool/examples/shared-demo.pl
 file path=usr/share/rrdtool/examples/stripes.pl
+file path=usr/share/rrdtool/ifOctets.tcl
+file path=usr/share/rrdtool/pkgIndex.tcl
 license rrdtool.license license=GPLv2