[csw-devel] SF.net SVN: gar:[13836] csw/mgar/pkg/rrdtool/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Mar 16 14:53:00 CET 2011 

Revision: 13836
          http://gar.svn.sourceforge.net/gar/?rev=13836&view=rev
Author:   dmichelsen
Date:     2011-03-16 13:52:59 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
rrdtool: Update to 1.4.5, massive restructuring

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/trunk/Makefile
    csw/mgar/pkg/rrdtool/trunk/checksums

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile	2011-03-16 12:44:30 UTC (rev 13835)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile	2011-03-16 13:52:59 UTC (rev 13836)
@@ -1,5 +1,5 @@
 NAME = rrdtool
-VERSION = 1.4.4
+VERSION = 1.4.5
 CATEGORIES = utils
 
 DESCRIPTION = Time-series data logging and graphing
@@ -12,50 +12,89 @@
 MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-# Use patch until this is fixed:
-#   http://oss.oetiker.ch/rrdtool-trac/ticket/284
-PATCHFILES += patch-bindings-ruby-extconf.rb
-
 # Make sure to link against libperl.so to make shared libraries self-contained.
 PATCHFILES += patch-bindings-perl-piped-Makefile.PL
 PATCHFILES += patch-bindings-perl-shared-Makefile.PL
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWrrdtool
+CATALOGNAME_CSWrrdtool = rrdtool
+SPKG_DESC_CSWrrdtool = Time-series data logging and graphing
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWglib2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWpango
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
+OBSOLETES_CSWrrdtool = CSWrrd
 
-PACKAGES = CSWrrd CSWrrdtool CSWrrdtool-devel CSWlibrrd4 CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool
+PACKAGES += CSWrrdtool-dev
+CATALOGNAME_CSWrrdtool-dev = rrdtool_dev
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
+PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
 
-CATALOGNAME_CSWrrd = rrd
-CATALOGNAME_CSWrrdtool = rrdtool
-CATALOGNAME_CSWrrdtool-devel = rrdtool_devel
+PACKAGES += CSWlibrrd4
 CATALOGNAME_CSWlibrrd4 = librrd4
+SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
+PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
+
+PACKAGES += CSWlibrrd-th4
+CATALOGNAME_CSWlibrrd-th4 = librrd_th4
+SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
+PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
+
+PACKAGES += CSWpm-rrdtool
 CATALOGNAME_CSWpm-rrdtool = pm_rrdtool
-CATALOGNAME_CSWpy-rrdtool = py_rrdtool
-CATALOGNAME_CSWrb-rrdtool = rb_rrdtool
-
-SPKG_DESC_CSWrrd = Stub package as contents now moved to CSWrrdtool
-SPKG_DESC_CSWrrdtool = $(DESCRIPTION)
-SPKG_DESC_CSWrrdtool-devel = Development Files for RRDTool
-SPKG_DESC_CSWlibrrd4 = Runtime libraries for RRDtool providing librrd_th.so.4
 SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool)
-SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
-SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
-
-RUNTIME_DEP_PKGS_CSWrrd = CSWrrdtool CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool
-RUNTIME_DEP_PKGS_CSWrrdtool = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool-devel = CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
+PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.*
+PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.*
+PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.*
+PKGFILES_CSWpm-rrdtool += .*\.3perl
 RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
 RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
+OBSOLETES_CSWpm-rrdtool = CSWrrd
+
+PACKAGES += CSWpy-rrdtool
+CATALOGNAME_CSWpy-rrdtool = py_rrdtool
+SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
+PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibintl8
+OBSOLETES_CSWpy-rrdtool = CSWrrd
+
+PACKAGES += CSWrb-rrdtool
+CATALOGNAME_CSWrb-rrdtool = rb_rrdtool
+SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
+PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1
 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
+OBSOLETES_CSWrb-rrdtool = CSWrrd
+# This is crappy and needs fixing, unfortunately inside extconf.rb which is hard.
+CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/trunk/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/RRD.so
 
 BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
-BUILD_DEP_PKGS += CSWpangodevel CSWlibcairodevel CSWglib2devel
+BUILD_DEP_PKGS += CSWpangodevel
+BUILD_DEP_PKGS += CSWlibcairodevel
+BUILD_DEP_PKGS += CSWglib2devel
 BUILD_DEP_PKGS += CSWperl
 BUILD_DEP_PKGS += CSWpython-devel
 BUILD_DEP_PKGS += CSWrubydev
@@ -69,12 +108,20 @@
 NOISAEXEC = 1
 STRIP_LIBTOOL = 1
 
-CONFIGURE_ARGS_32 = --enable-python --enable-ruby --with-ruby-options=CFLAGS= --enable-perl --with-perl-options=INSTALLDIRS=vendor
-CONFIGURE_ARGS_64 = --disable-python --disable-ruby --disable-perl
+CONFIGURE_ARGS_32 += --enable-python
+CONFIGURE_ARGS_32 += --enable-ruby
+CONFIGURE_ARGS_32 += --with-ruby-options=RUBY_MAKE_OPTIONS=DESTDIR=$(DESTDIR)
+CONFIGURE_ARGS_32 += --enable-perl
+CONFIGURE_ARGS_32 += --with-perl-options=INSTALLDIRS=vendor
+# We don't have any of these in 64 bit (yet!)
+CONFIGURE_ARGS_64 += --disable-python
+CONFIGURE_ARGS_64 += --disable-ruby
+CONFIGURE_ARGS_64 += --disable-perl
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(NAME)
-CONFIGURE_ARGS += --disable-lua --disable-tcl
+CONFIGURE_ARGS += --disable-lua
+CONFIGURE_ARGS += --disable-tcl
 CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
@@ -83,29 +130,32 @@
 MERGE_DIRS_isa-extra = $(libdir)
 MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
-EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),'
+EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/rrdtool,'
 
-ARCHALL_CSWrrd = 1
+include gar/category.mk
 
-PKGFILES_CSWrrd = NOFILES
-PKGFILES_CSWrrdtool-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibrrd4 = $(PKGFILES_RT)
-PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.*
-PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.*
-PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.*
-PKGFILES_CSWpm-rrdtool += .*\.3perl
-PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
-PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
+post-install-modulated:
+	perl -pi -e 's,/usr/local,$(prefix),g' \
+		$(addprefix $(DESTDIR), \
+		/opt/csw/share/perl/csw/RRDp.pm \
+		/opt/csw/share/man/man3/RRDp.3perl \
+		/opt/csw/share/man/man1/rrd-beginners.1 \
+		/opt/csw/share/man/man1/rrdcgi.1 \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.pod \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.pod \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.txt \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.txt \
+		/opt/csw/share/doc/rrdtool-1.4.5/html/rrd-beginners.html \
+		/opt/csw/share/doc/rrdtool-1.4.5/html/RRDp.html \
+		/opt/csw/share/doc/rrdtool-1.4.5/html/rrdcgi.html \
+		)
 
-# Make legacy package depend on all new ones
-CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpm-rrdtool
-CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpy-rrdtool
-CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrb-rrdtool
-CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrrdtool
+	perl -pi -e 's,/usr/share,$(prefix),g' \
+		$(addprefix $(DESTDIR), \
+		/opt/csw/share/man/man1/rrdbuild.1 \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.txt \
+		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.pod \
+		/opt/csw/share/doc/rrdtool-1.4.5/html/rrdbuild.html \
+		)
 
-# These libraries always come in pairs, bundle them also
-CHECKPKG_OVERRIDES_CSWlibrrd4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/librrd_th.so.4.1.4|soname=librrd_th.so.4|pkgname=CSWlibrrd4|expected=CSWlibrrd-th4
-CHECKPKG_OVERRIDES_CSWlibrrd4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/librrd_th.so.4.1.4|soname=librrd_th.so.4|pkgname=CSWlibrrd4|expected=CSWlibrrd-th4
-
-include gar/category.mk
-
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums	2011-03-16 12:44:30 UTC (rev 13835)
+++ csw/mgar/pkg/rrdtool/trunk/checksums	2011-03-16 13:52:59 UTC (rev 13836)
@@ -1 +1 @@
-93ad2fc2e9ddcd7d99c611fe30284a54  rrdtool-1.4.4.tar.gz
+4d116dba9a0888d8aaac179e35d3980a  rrdtool-1.4.5.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list