[csw-devel] SF.net SVN: gar:[10310] csw/mgar/pkg/rrdtool/branches

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jun 24 15:52:17 CEST 2010 

Revision: 10310
          http://gar.svn.sourceforge.net/gar/?rev=10310&view=rev
Author:   dmichelsen
Date:     2010-06-24 13:52:17 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
rrdtool/x11-reloaded: Make progress

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile
    csw/mgar/pkg/rrdtool/branches/x11-reloaded/checksums

Added Paths:
-----------
    csw/mgar/pkg/rrdtool/branches/x11-reloaded/

Modified: csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-06-20 19:56:38 UTC (rev 10269)
+++ csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile	2010-06-24 13:52:17 UTC (rev 10310)
@@ -1,8 +1,8 @@
 GARNAME = rrdtool
-GARVERSION = 1.4.2
+GARVERSION = 1.4.3
 CATEGORIES = utils
 
-DESCRIPTION = Time-series data logging and graphing.
+DESCRIPTION = Time-series data logging and graphing
 define BLURB
   RRDtool is basically the time-series graphing and data storage/management
   component of MRTG, broken out and `done right'. `done right' means that
@@ -12,99 +12,87 @@
 MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
+PATCHFILES += patch-src-Makefile.in
+PATCHFILES += patch-src-rrd_open.c
+PATCHFILES += patch-bindings-Makefile.in
+PATCHFILES += patch-bindings-ruby-extconf.rb
+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 = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWrrd
-CATALOGNAME = rrdtool
+PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
 
-RUNTIME_DEP_PKGS += CSWggettextrt
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWiconv
-RUNTIME_DEP_PKGS += CSWlibcairo
-RUNTIME_DEP_PKGS += CSWpango
-RUNTIME_DEP_PKGS += CSWpng
-RUNTIME_DEP_PKGS += CSWsunmath
-RUNTIME_DEP_PKGS += CSWzlib
-RUNTIME_DEP_PKGS += CSWperl
-RUNTIME_DEP_PKGS += CSWruby
-RUNTIME_DEP_PKGS += CSWpython
-RUNTIME_DEP_PKGS += CSWlibxml2
+CATALOGNAME_CSWrrd = rrdtool
+CATALOGNAME_CSWrrdrt = rrdtool_rt
+CATALOGNAME_CSWpmrrd = pm_rrd
+CATALOGNAME_CSWpy-rrdtool = py_rrdtool
+CATALOGNAME_CSWrbrrd = rb_rrd
 
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS)
-BUILD_DEP_PKGS += CSWlibpthreadstubs
-BUILD_DEP_PKGS += CSWlibxaudevel
-BUILD_DEP_PKGS += CSWlibxcbdevel
-BUILD_DEP_PKGS += CSWpangodevel
-BUILD_DEP_PKGS += CSWlibcairodevel
-BUILD_DEP_PKGS += CSWglib2devel
-BUILD_DEP_PKGS += CSWxproto
-BUILD_DEP_PKGS += CSWlibxrenderdevel
-BUILD_DEP_PKGS += CSWrenderproto
-BUILD_DEP_PKGS += CSWkbproto
+SPKG_DESC_CSWrrd = $(DESCRIPTION)
+SPKG_DESC_CSWrrdrt = Runtime libraries for RRDtool
+SPKG_DESC_CSWpmrrd = RRDs: Access RRDtool as a shared module (part of RRDtool)
+SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
+SPKG_DESC_CSWrbrrd = Ruby binding for RRD access (part of RRDtool)
+
+RUNTIME_DEP_PKGS_CSWrrd = CSWrrdrt CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrdrt += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
+RUNTIME_DEP_PKGS_CSWpmrrd = CSWperl CSWrrdrt
+RUNTIME_DEP_PKGS_CSWpy-rrdtool = CSWpython CSWrrdrt
+RUNTIME_DEP_PKGS_CSWrbrrd = CSWruby CSWrrdrt
+
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWrrdrt)
+BUILD_DEP_PKGS += CSWpangodevel CSWlibcairodevel CSWglib2devel
+BUILD_DEP_PKGS += CSWperl
 BUILD_DEP_PKGS += CSWpython-devel
 BUILD_DEP_PKGS += CSWrubydev
 
 EXTRA_INC = $(prefix)/include/cairo
 EXTRA_INC += $(prefix)/include/libxml2
-EXTRA_INC += $(prefix)/X11/include
 
-EXTRA_LIB = $(prefix)/X11/lib
+BUILD64 = 1
+NOISAEXEC = 1
+STRIP_LIBTOOL = 1
 
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+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
 
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(GARNAME)
-CONFIGURE_ARGS += --disable-lua 
-CONFIGURE_ARGS += --enable-python
-CONFIGURE_ARGS += --enable-ruby
-CONFIGURE_ARGS += --with-ruby-options=CFLAGS=
-CONFIGURE_ARGS += --enable-perl
-CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --disable-lua --disable-tcl
 CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
-EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod
-
 TEST_TARGET = check
 
-PATCHFILES += patch-src-Makefile.in
-PATCHFILES += patch-src-rrd_open.c
-PATCHFILES += patch-bindings-Makefile.in
-PATCHFILES += patch-bindings-ruby-extconf.rb
-PATCHFILES += patch-bindings-perl-piped-Makefile.PL
-PATCHFILES += patch-bindings-perl-shared-Makefile.PL
+MERGE_DIRS_isa-extra = $(bindir)
+MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
+EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
+EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(GARNAME)-$(GARVERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),'
 
-BUILD64 = 1
+PKGFILES_CSWrrdrt = $(PKGFILES_RT)
+PKGFILES_CSWpmrrd = $(libdir)/perl/.* $(sharedstatedir)/perl/.* .*\.3perl
+PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
+PKGFILES_CSWrbrrd = $(libdir)/ruby/.*
 
-STRIP_LIBTOOL = 1
+CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrrdrt
 
+CHECKPKG_OVERRIDES_CSWpy-rrdtool += missing-dependency|CSWrrd
+CHECKPKG_OVERRIDES_CSWpy-rrdtool += surplus-dependency|CSWrrdrt
+
+CHECKPKG_OVERRIDES_CSWpmrrd += missing-dependency|CSWrrd
+CHECKPKG_OVERRIDES_CSWpmrrd += surplus-dependency|CSWrrdrt
+
+CHECKPKG_OVERRIDES_CSWrbrrd += missing-dependency|CSWrrd
+CHECKPKG_OVERRIDES_CSWrbrrd += surplus-dependency|CSWrrdrt
+CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so
+
 include gar/category.mk
-# ugly fix to fix doc path
-#post-install-modulated:
-	#echo "  ==> Fixing doc path"
-	#mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool
 
 pre-build-modulated:
 	echo "  ==> Adding math function round()"
 	cp $(FILEDIR)/s_round.c $(WORKSRC)/src
 	cp $(FILEDIR)/s_round.h $(WORKSRC)/src
 	@$(MAKECOOKIE)
-
-post-patch-isa-amd64:
-	@# since our perl/python is 32bit, we need to patch away the build
-	echo "  ==> Removing perl/python module"
-	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
-	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
-	@$(MAKECOOKIE)
-
-post-patch-isa-sparcv9:
-	@# since our perl/python is 32bit, we need to patch away the build
-	echo "  ==> Removing perl/python module"
-	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
-	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/rrdtool/branches/x11-reloaded/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-06-20 19:56:38 UTC (rev 10269)
+++ csw/mgar/pkg/rrdtool/branches/x11-reloaded/checksums	2010-06-24 13:52:17 UTC (rev 10310)
@@ -4,4 +4,4 @@
 072482090287b462c8c092b2ead132da  patch-bindings-ruby-extconf.rb
 20e58c7facf2687037288c157c32df1a  patch-src-Makefile.in
 47709778545eec2e8c5c3b38f9c94fcd  patch-src-rrd_open.c
-9318d3b4016dd9dd9897f1eac7548032  rrdtool-1.4.2.tar.gz
+492cf946c72f85987238faa2c311b7bb  rrdtool-1.4.3.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