[csw-devel] SF.net SVN: gar:[10448] csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 10448
          http://gar.svn.sourceforge.net/gar/?rev=10448&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:34:29 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
rrd/x11-reloaded: Make just one package for now

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

Modified: csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile	2010-07-05 21:32:14 UTC (rev 10447)
+++ csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile	2010-07-05 21:34:29 UTC (rev 10448)
@@ -24,7 +24,8 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
+# PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
+PACKAGES = CSWrrd
 
 CATALOGNAME_CSWrrd = rrdtool
 CATALOGNAME_CSWrrdrt = rrdtool_rt
@@ -38,7 +39,8 @@
 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_CSWrrd = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
+# RUNTIME_DEP_PKGS_CSWrrd += CSWrrdrt
 RUNTIME_DEP_PKGS_CSWrrdrt += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
 RUNTIME_DEP_PKGS_CSWpmrrd = CSWperl CSWrrdrt
 RUNTIME_DEP_PKGS_CSWpy-rrdtool = CSWpython CSWrrdrt
@@ -68,7 +70,7 @@
 
 TEST_TARGET = check
 
-MERGE_DIRS_isa-extra = $(bindir)
+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)/$(GARNAME)-$(GARVERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),'
@@ -85,6 +87,15 @@
 CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
 CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
 
+# Take these out when the package are split again
+CHECKPKG_OVERRIDES_CSWrrd += binary-architecture-does-not-match-placement|file=opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWrrd += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWrrd += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWrrd += 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
+CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-i386/install-isa-i386/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/i386-solaris2.8/RRD.so
+CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWruby
+CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWpython
+
 include gar/category.mk
 
 pre-build-modulated:


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