20035678 Migrate rrdtool from Desktop consolidation to Userland
authorYamei Feng <yamei.feng@oracle.com>
Mon, 16 Mar 2015 17:00:04 -0700
changeset 3960 9e7316c31217
parent 3959 0de894549bd0
child 3961 5a5f6cf79a19
20035678 Migrate rrdtool from Desktop consolidation to Userland
components/rrdtool/Makefile
components/rrdtool/patches/rrdtool.bindings.lua.rrdlua.c.patch
components/rrdtool/patches/rrdtool.configure.ac.patch
components/rrdtool/rrdtool.license
components/rrdtool/rrdtool.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rrdtool/Makefile	Mon Mar 16 17:00:04 2015 -0700
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=         rrdtool
+COMPONENT_VERSION=      1.4.3
+COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= sha256:1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
+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
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATH=$(dir $(CC)):/usr/bin:/usr/sbin:/usr/gnu/bin
+
+PERL_VERSION.32 = 5.12
+PERL_VERSION.64 = 5.16
+PERL_VERSION = $(PERL_VERSION.$(BITS))
+
+COMPONENT_PRE_CONFIGURE_ACTION = \
+	($(CLONEY) $(SOURCE_DIR) $(@D))
+
+COMPONENT_PREP_ACTION = ( cd $(@D); autoconf -f)
+
+CONFIGURE_OPTIONS  += --enable-perl 
+CONFIGURE_OPTIONS  += --disable-python
+CONFIGURE_OPTIONS  += --disable-ruby
+CONFIGURE_OPTIONS  += --enable-tcl
+CONFIGURE_OPTIONS  += --enable-static=no
+CONFIGURE_OPTIONS  +=   CC="$(CC) $(CC_BITS)" 
+CONFIGURE_OPTIONS  +=   CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=   LDFLAGS="$(LDFLAGS)"
+CONFIGURE_OPTIONS  +=   PERL=/usr/perl5/$(PERL_VERSION)/bin/perl
+CONFIGURE_OPTIONS  +=   POD2MAN=/usr/perl5/$(PERL_VERSION)/bin/pod2man
+CONFIGURE_OPTIONS  +=   POD2HTML=/usr/perl5/$(PERL_VERSION)/bin/pod2html
+CONFIGURE_OPTIONS  +=   PERLCC="\"$(CC) $(CC_BITS)\""
+CONFIGURE_OPTIONS  +=   PERLCCFLAGS="\"$(CFLAGS)\""
+CONFIGURE_OPTIONS  +=   PERLLD="\"$(CC) $(CC_BITS)\""
+CONFIGURE_OPTIONS  +=   PERLLIB=/usr/perl5/$(PERL_VERSION)/lib
+CONFIGURE_OPTIONS  +=   PERLINSTALLMAN3DIR=/usr/share/man/man3
+CONFIGURE_OPTIONS  +=   PERLINSTALLSITEMAN3DIR=/usr/share/man/man3
+CONFIGURE_OPTIONS  +=   PERLINSTALLVENDORMAN3DIR=/usr/share/man/man3
+
+$(CONFIGURE_64): CONFIGURE_OPTIONS  +=   LUARRDLIBDIR=64
+
+PKG_MACROS         +=   P_ARCH=$(shell arch)
+
+ASLR_MODE	    =   $(ASLR_ENABLE)
+
+# common targets
+configure:	$(CONFIGURE_32_and_64)
+
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(NO_TESTS)
+		
+BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
+
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += runtime/lua
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rrdtool/patches/rrdtool.bindings.lua.rrdlua.c.patch	Mon Mar 16 17:00:04 2015 -0700
@@ -0,0 +1,22 @@
+# 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
[email protected]@ -342,7 +342,7 @@
+ 
+ /**********************************************************/
+ 
+-static const struct luaL_reg rrd[] = {
++static const struct luaL_Reg rrd[] = {
+   {"create", lua_rrd_create},
+   {"dump", lua_rrd_dump},
+   {"fetch", lua_rrd_fetch},
[email protected]@ -373,7 +373,7 @@ luaopen_rrd (lua_State * L)
+   /* luaL_module is defined in compat-5.1.c */
+   luaL_module (L, "rrd", rrd, 0);
+ #else
+-  luaL_register (L, "rrd", rrd);
++  lua_newlib(L, rrd);
+ #endif
+   set_info (L);
+   return 1;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rrdtool/patches/rrdtool.configure.ac.patch	Mon Mar 16 17:00:04 2015 -0700
@@ -0,0 +1,80 @@
+# PERL and LUA setup for generating 64-bit binaries
+# The first three changes are Solaris-specific,
+# 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
+ CONFIGURE_PART(Prep for Building Language Bindings)
+   
+ dnl Check for Perl and friends
+-PATH=$PATH:/usr/perl5/bin
+-export PATH
+ 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
+ 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"
+ 
+ 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
+    if test ! -z "$PERLLDFLAGS"; then
+        PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LDFLAGS=$PERLLDFLAGS"
+    fi
++
++   if test ! -z "$PERLLIB"; then
++	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS LIB=$PERLLIB"
++   fi
++
++   if test ! -z "$PERLINSTALLMAN3DIR"; then
++	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLMAN3DIR=$PERLINSTALLMAN3DIR"
++   fi
++
++   if test ! -z "$PERLINSTALLSITEMAN3DIR"; then
++	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLSITEMAN3DIR=$PERLINSTALLSITEMAN3DIR"
++   fi
++
++   if test ! -z "$PERLINSTALLVENDORMAN3DIR"; then
++	PERL_MAKE_OPTIONS="$PERL_MAKE_OPTIONS INSTALLVENDORMAN3DIR=$PERLINSTALLVENDORMAN3DIR"
++   fi
+ fi
+         
+ AC_ARG_WITH(perl-options,
[email protected]@ -725,8 +739,15 @@ LUA_EOF
+       LIBS=
+       lua_havelib=no
+       LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
+-      AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
+-        [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
++         if test "$lua_vndot" = "52"; then
++        CALL_FUNC=lua_callk
++        REG_FUNC=luaL_setfuncs
++      else
++        CALL_FUNC=lua_call
++        REG_FUNC=lua_register
++      fi
++      AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
++        [AC_SEARCH_LIBS($REG_FUNC, lua$lua_vdot lua$lua_vndot lua,
+           [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
+           done
+         fi
+ 
+-        LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
++	if test ! -z "$LUARRDLIBDIR"; then
++         LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot/$LUARRDLIBDIR"
++	else
++	  LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
++	fi
++
+         # if lua 5.0 can't find compat-5.1, force installation of
+         # compat-5.1.lua together with RRDtool.
+         if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rrdtool/rrdtool.license	Mon Mar 16 17:00:04 2015 -0700
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rrdtool/rrdtool.p5m	Mon Mar 16 17:00:04 2015 -0700
@@ -0,0 +1,219 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/image/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="RRDtool-Round Robin Database tool"
+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=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/129
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file usr/bin/$(MACH64)/rrdcached path=usr/bin/rrdcached
+file usr/bin/$(MACH64)/rrdcgi path=usr/bin/rrdcgi
+file usr/bin/$(MACH64)/rrdtool path=usr/bin/rrdtool
+file usr/bin/$(MACH64)/rrdupdate path=usr/bin/rrdupdate
+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
+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/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
+link path=usr/lib/lua/5.2/rrd.so target=rrd.so.0.0.0
+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
+file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/.packlist
+file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/RRDs.bs
+file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/RRDs.so
+file path=usr/perl5/5.12/lib/RRDp.pm
+file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/RRDs.pm
+file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDp/.packlist
+file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/.packlist
+file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/RRDs.bs
+file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/RRDs.so
+file path=usr/perl5/5.16/lib/RRDp.pm
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/RRDp.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/RRDs.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/bin_dec_hex.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/cdeftutorial.html
+link path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/index.html \
+    target=rrdtool.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/librrd.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rpntutorial.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrd-beginners.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdbuild.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdcached.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdcgi.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdcreate.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrddump.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdfetch.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdfirst.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdflushcached.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdgraph.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdgraph_data.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdgraph_examples.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdgraph_graph.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdgraph_rpn.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdinfo.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdlast.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdlastupdate.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdlua.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdresize.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdrestore.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdthreads.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdtool.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdtune.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdtutorial.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdupdate.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/rrdxport.html
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/bin_dec_hex.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/bin_dec_hex.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/cdeftutorial.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/cdeftutorial.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/librrd.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rpntutorial.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rpntutorial.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrd-beginners.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrd-beginners.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdbuild.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdbuild.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcached.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcached.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcgi.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcgi.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcreate.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdcreate.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrddump.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrddump.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdfetch.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdfetch.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdfirst.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdfirst.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdflushcached.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdflushcached.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_data.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_data.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_examples.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_examples.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_graph.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_graph.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_rpn.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdgraph_rpn.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdinfo.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdinfo.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlast.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlast.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlastupdate.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlastupdate.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlua.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdlua.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdresize.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdresize.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdrestore.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdrestore.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdthreads.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdthreads.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtool.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtool.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtune.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtune.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtutorial.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdtutorial.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdupdate.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdupdate.txt
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdxport.pod
+file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/txt/rrdxport.txt
+file path=usr/share/man/man1/bin_dec_hex.1
+file path=usr/share/man/man1/cdeftutorial.1
+file path=usr/share/man/man1/rpntutorial.1
+file path=usr/share/man/man1/rrd-beginners.1
+file path=usr/share/man/man1/rrdbuild.1
+file path=usr/share/man/man1/rrdcached.1
+file path=usr/share/man/man1/rrdcgi.1
+file path=usr/share/man/man1/rrdcreate.1
+file path=usr/share/man/man1/rrddump.1
+file path=usr/share/man/man1/rrdfetch.1
+file path=usr/share/man/man1/rrdfirst.1
+file path=usr/share/man/man1/rrdflushcached.1
+file path=usr/share/man/man1/rrdgraph.1
+file path=usr/share/man/man1/rrdgraph_data.1
+file path=usr/share/man/man1/rrdgraph_examples.1
+file path=usr/share/man/man1/rrdgraph_graph.1
+file path=usr/share/man/man1/rrdgraph_rpn.1
+file path=usr/share/man/man1/rrdinfo.1
+file path=usr/share/man/man1/rrdlast.1
+file path=usr/share/man/man1/rrdlastupdate.1
+file path=usr/share/man/man1/rrdlua.1
+file path=usr/share/man/man1/rrdresize.1
+file path=usr/share/man/man1/rrdrestore.1
+file path=usr/share/man/man1/rrdthreads.1
+file path=usr/share/man/man1/rrdtool.1
+file path=usr/share/man/man1/rrdtune.1
+file path=usr/share/man/man1/rrdtutorial.1
+file path=usr/share/man/man1/rrdupdate.1
+file path=usr/share/man/man1/rrdxport.1
+file path=usr/share/man/man3/RRDp.3
+file path=usr/share/man/man3/RRDs.3
+file path=usr/share/man/man3/librrd.3
+file path=usr/share/rrdtool/examples/4charts.pl
+file path=usr/share/rrdtool/examples/bigtops.pl
+file path=usr/share/rrdtool/examples/cgi-demo.cgi
+file path=usr/share/rrdtool/examples/minmax.pl
+file path=usr/share/rrdtool/examples/perftest.pl
+file path=usr/share/rrdtool/examples/piped-demo.pl
+file path=usr/share/rrdtool/examples/rrdcached/RRDCached.pm
+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
+license rrdtool.license license=GPLv2