[csw-devel] SF.net SVN: gar:[16238] csw/mgar/pkg/orca/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Nov 23 22:30:58 CET 2011 

Revision: 16238
          http://gar.svn.sourceforge.net/gar/?rev=16238&view=rev
Author:   dmichelsen
Date:     2011-11-23 21:30:58 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
orca/trunk: Move to git snap, further split packages

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

Added Paths:
-----------
    csw/mgar/pkg/orca/trunk/files/0001-Skip-unversioned-SVN-as-we-are-now-in-GITland.patch

Modified: csw/mgar/pkg/orca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/orca/trunk/Makefile	2011-11-23 15:36:37 UTC (rev 16237)
+++ csw/mgar/pkg/orca/trunk/Makefile	2011-11-23 21:30:58 UTC (rev 16238)
@@ -1,6 +1,5 @@
 NAME = orca
-VERSION = snapshot-r535
-SPKG_VERSION = snapshot_r535
+VERSION = csw-1.0
 CATEGORIES = utils
 
 DESCRIPTION = A system performance monitoring tool
@@ -26,83 +25,128 @@
 
 endef
 
-MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = https://github.com/blair/orca/tarball/master
+# DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += csworcallator csworcallator.xml svc-csworcallator
 DISTFILES += csworca_services
 DISTFILES += csworca
-PATCHFILES  = $(NAME)-$(VERSION)-se-3.5.0.patch
+PATCHFILES  = orca-snapshot-r535-se-3.5.0.patch
 PATCHFILES += fix-start-orcallator.patch
+PATCHFILES += 0001-Skip-unversioned-SVN-as-we-are-now-in-GITland.patch
 
-PACKAGES = CSWorca CSWorcaweb
+GIT_REPOS  = git://github.com/dago/orca.git
+GIT_TREEISH_orca.git = $(VERSION)
 
-CATALOGNAME_CSWorca    = orca
-CATALOGNAME_CSWorcaweb = orca_web
+VENDOR_URL = http://www.orcaware.com/orca
 
-SPKG_DESC_CSWorca = Performance Data Collector
-SPKG_DESC_CSWorcaweb = Performance Data Viewer
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWpmtimedate
+BUILD_DEP_PKGS += CSWpmmathinterpolate
+BUILD_DEP_PKGS += CSWpm-rrdtool
+BUILD_DEP_PKGS += CSWgawk
+BUILD_DEP_PKGS += CSWbzip2
+BUILD_DEP_PKGS += CSWsetoolkit
 
-SPKG_SOURCEURL = http://www.orcaware.com/orca
+PACKAGES += CSWorcallator
+SPKG_DESC_CSWorcallator = Orcallator performance data collector
+PKGFILES_CSWorcallator += /etc/opt/csw/init.d/csworcallator
+PKGFILES_CSWorcallator += $(bindir)/.*orcallator.*
+PKGFILES_CSWorcallator += $(libdir)/orca/orcallator.se
+ARCHALL_CSWorcallator = 1
+RUNTIME_DEP_PKGS_CSWorcallator += CSWsetoolkit
+RUNTIME_DEP_PKGS_CSWorcallator += CSWgawk
+RUNTIME_DEP_PKGS_CSWorcallator += CSWbzip2
+# Checkpkg can't track these
+CHECKPKG_OVERRIDES_CSWorcallator += surplus-dependency|CSWsetoolkit
+CHECKPKG_OVERRIDES_CSWorcallator += surplus-dependency|CSWgawk
+CHECKPKG_OVERRIDES_CSWorcallator += surplus-dependency|CSWbzip2
+OBSOLETED_BY_CSWorcallator += CSWorca
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGES += CSWorca-services-collector
+SPKG_DESC_CSWorca-services-collector = Orca services data collector
+PKGFILES_CSWorca-services-collector += /etc/opt/csw/init.d/csworca_services
+PKGFILES_CSWorca-services-collector += $(bindir)/.*orca_services.*
+PKGFILES_CSWorca-services-collector += $(libexecdir)/orca_services
+ARCHALL_CSWorca-services-collector = 1
+OBSOLETED_BY_CSWorca-services-collector += CSWorca
 
-BUILD_DEP_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit
+PACKAGES += CSWorca-web
+SPKG_DESC_CSWorca-web = Performance Data Viewer
+ARCHALL_CSWorca-web = 1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWorca-web += CSWperl
+RUNTIME_DEP_PKGS_CSWorca-web += CSWpmtimedate
+RUNTIME_DEP_PKGS_CSWorca-web += CSWpmmathinterpolate
+RUNTIME_DEP_PKGS_CSWorca-web += CSWrrd
+RUNTIME_DEP_PKGS_CSWorca-web += CSWapache2
+# Checkpkg can't track Perl dependencies
+CHECKPKG_OVERRIDES_CSWorca-web += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWorca-web += surplus-dependency|CSWpmtimedate
+CHECKPKG_OVERRIDES_CSWorca-web += surplus-dependency|CSWpmmathinterpolate
+CHECKPKG_OVERRIDES_CSWorca-web += surplus-dependency|CSWrrd
+CHECKPKG_OVERRIDES_CSWorca-web += surplus-dependency|CSWapache2
+OBSOLETED_BY_CSWorca-web += CSWorcaweb
+CATALOGNAME_CSWorcaweb = orca_web_stub
 
-RUNTIME_DEP_PKGS_CSWorca     = CSWsetoolkit CSWperl CSWpmtimedate
-RUNTIME_DEP_PKGS_CSWorca    += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2
-RUNTIME_DEP_PKGS_CSWorcaweb  = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2
+# TBD: Adjust to OpenCSW radius location
+REINPLACEMENTS += radiuslog
+REINPLACE_MATCH_radiuslog = /usr/local/etc/raddb/logfile
+REINPLACE_WITH_radiuslog = /var/opt/csw/radius.log
+REINPLACE_FILES_radiuslog = data_gatherers/orca_services/orca_services.pl.in
 
-sysconfdir    = /etc/opt/csw
-localstatedir = /var/opt/csw
+REINPLACEMENTS += radiusauth
+REINPLACE_MATCH_radiusauth = /usr/local/lib/orca_services.DB.
+REINPLACE_WITH_radiusauth = $(libexecdir)/orca_services.DB.
+REINPLACE_FILES_radiusauth = data_gatherers/orca_services/orca_services.pl.in
 
-COMMON_EXPORTS += perlcswlib
+# TBD: Adjust to OpenCSW pop logfile location
+REINPLACEMENTS += pop
+REINPLACE_MATCH_pop = /var/log/ipop3d.log
+REINPLACE_WITH_pop = /var/opt/csw/ipop3d.log
+REINPLACE_FILES_pop = data_gatherers/orca_services/orca_services.pl.in
 
-CONFIGURE_ARGS = $(DIRPATHS) \
-	--with-html-dir=$(sharedstatedir)/www/orca \
-	--disable-librrdtool
+# TBD: Adjust to OpenCSW named logfiles location
+REINPLACEMENTS += dns
+REINPLACE_MATCH_dns = /var/log/named
+REINPLACE_WITH_dns = /var/opt/csw/named/named.log
+REINPLACE_FILES_dns = data_gatherers/orca_services/orca_services.pl.in
 
+
+
+EXTRA_COMMON_EXPORTS += perlcswlib
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-html-dir=$(sharedstatedir)/www/orca
+CONFIGURE_ARGS += --disable-librrdtool
+
 # Exclude se-libraries for old SE Toolkit versions. We depend on 3.5.0 which
 # includes all needed se-libraries.
 EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/SE/.*
 
+# This is for A/IX only
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/orca-aix-stat
+
+# This is for HP only
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/orca-hp-stat
+
+# This is for Linux /proc only
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/procallator
+
 PRESERVECONF = /etc/opt/csw/orcallator.cfg
 PRESERVECONF += /etc/opt/csw/winallator.cfg
 PRESERVECONF += /etc/opt/csw/procallator.cfg
 PRESERVECONF += /etc/opt/csw/orca_services.cfg
 
-INITSMF = /etc/opt/csw/init.d/csworca
+INITSMF += /etc/opt/csw/init.d/csworca
 INITSMF += /etc/opt/csw/init.d/csworcallator
+INITSMF += /etc/opt/csw/init.d/csworca_services
 
-ARCHALL = 1
+include gar/category.mk
 
-PKGFILES_CSWorcaweb  = $(prefix)/apache2/.*
-PKGFILES_CSWorcaweb += $(sharedstatedir)/www/orca/.*
-PKGFILES_CSWorcaweb += $(bindir)/orca
-PKGFILES_CSWorcaweb += $(sysconfdir)/.*\.cfg
-PKGFILES_CSWorcaweb += $(libdir)/perl/.*
-PKGFILES_CSWorcaweb += $(mandir)/man1/orca\.1
-PKGFILES_CSWorcaweb += /var/opt/csw/.*
-PKGFILES_CSWorcaweb += /etc/opt/csw/init.d/csworca
+post-extract-modulated:
+	-cd $(WORKSRC) && ./autogen.sh
+	@$(MAKECOOKIE)
 
-# This one is purely optional
-CHECKPKG_OVERRIDES_CSWorca += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/csworca_services|class=none
-
-# Checkpkg can't track Perl dependencies
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWgawk
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWrrd
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWpmtimedate
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWpmmathinterpolate
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWbzip2
-CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWsetoolkit
-CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWrrd
-CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWpmtimedate
-CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWpmmathinterpolate
-
-include gar/category.mk
-
 post-install-modulated:
 	@ginstall -d $(DESTDIR)$(sysconfdir)/init.d
 	@# TBD: Use custom manifest for Solaris 10 SMF support
@@ -113,7 +157,3 @@
 
 post-merge:
 	@ginstall -d $(PKGROOT)/var/opt/csw/orca/rrd/orcallator
-	@ginstall -d $(PKGROOT)$(prefix)/share/www/orca/orcallator
-	@ginstall -d $(PKGROOT)$(prefix)/apache2/share/htdocs
-	@ln -s $(prefix)/share/www/orca $(PKGROOT)$(prefix)/apache2/share/htdocs/orca
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/orca/trunk/checksums
===================================================================
--- csw/mgar/pkg/orca/trunk/checksums	2011-11-23 15:36:37 UTC (rev 16237)
+++ csw/mgar/pkg/orca/trunk/checksums	2011-11-23 21:30:58 UTC (rev 16238)
@@ -1,8 +0,0 @@
-40a01bc6854c77a39c00014e72cae252  csworca
-4c74f4f1449fabd0838d0cd71678144c  csworca_services
-72c1eaa8d3f1ab48363e7ed5792e2855  csworcallator
-a99644ffcc9164d9d0f4df2b44c61917  csworcallator.xml
-22e921ee0ebc822479e99041d1045952  fix-start-orcallator.patch
-ce08f37aa52f7b27bc82cc9c976d56b4  orca-snapshot-r535-se-3.5.0.patch
-ba8e48e429008f53037e85fef2fcfe36  orca-snapshot-r535.tar.bz2
-23a2b76456b96c5fcff4a1d92c02e140  svc-csworcallator

Added: csw/mgar/pkg/orca/trunk/files/0001-Skip-unversioned-SVN-as-we-are-now-in-GITland.patch
===================================================================
--- csw/mgar/pkg/orca/trunk/files/0001-Skip-unversioned-SVN-as-we-are-now-in-GITland.patch	                        (rev 0)
+++ csw/mgar/pkg/orca/trunk/files/0001-Skip-unversioned-SVN-as-we-are-now-in-GITland.patch	2011-11-23 21:30:58 UTC (rev 16238)
@@ -0,0 +1,24 @@
+From a271f9acd7dd49064eddc4aa66477d551e60b071 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 23 Nov 2011 21:28:07 +0100
+Subject: [PATCH] Skip unversioned SVN as we are now in GITland
+
+---
+ lib/Makefile.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index b5f1ff1..f5ae744 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -51,6 +51,7 @@ install-orca: all
+ 	@current_rev="`cd ..; sh -c 'svnversion .' 2>/dev/null || true`"; \
+ 	echo "Subversion reversion of Orca is: $$current_rev"; \
+ 	if test "$$current_rev" != "" && \
++	  test "$$current_rev" != "Unversioned directory" && \
+ 	  test "$$current_rev" != "exported"; then \
+ 	  echo Fixing svn revision number in $(DESTDIR)$(libdir)/perl/csw/Orca/Constants.pm; \
+ 	  echo $(PERL) -w -p -i \
+-- 
+1.7.6.1
+

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