[csw-devel] SF.net SVN: gar:[7003] csw/mgar/pkg/orca/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 29 10:04:27 CET 2009
Revision: 7003
http://gar.svn.sourceforge.net/gar/?rev=7003&view=rev
Author: dmichelsen
Date: 2009-10-29 09:04:27 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
orca: Move to dynamic gspec
Modified Paths:
--------------
csw/mgar/pkg/orca/trunk/Makefile
csw/mgar/pkg/orca/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend
csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec
csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype
csw/mgar/pkg/orca/trunk/files/CSWorca.depend
csw/mgar/pkg/orca/trunk/files/CSWorca.gspec
csw/mgar/pkg/orca/trunk/files/CSWorca.prototype
Property Changed:
----------------
csw/mgar/pkg/orca/trunk/
Property changes on: csw/mgar/pkg/orca/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/orca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 09:04:27 UTC (rev 7003)
@@ -28,33 +28,58 @@
MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWorca,depend prototype)
+DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove
DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator
DISTFILES += csworca_services
-DISTFILES += $(call admfiles,CSWorca-web,depend prototype postinstall preremove)
+PACKAGES = CSWorca CSWorca-web
+
+CATALOGNAME_CSWorca = orca
+CATALOGNAME_CSWorca-web = orca_web
+
PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch
+SPKG_SOURCEURL = http://www.orcaware.com/orca
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit
+REQUIRED_PKGS_CSWorca = CSWcswclassutils CSWsetoolkit CSWperl CSWpmtimedate
+REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2
+REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2
+
#libdir = $(exec_prefix)/lib/$(GARNAME)
localstatedir = /var/opt/csw
COMMON_EXPORTS += perlcswlib
CONFIGURE_ARGS = $(DIRPATHS) \
- --with-html-dir=$(prefix)/apache2/share/htdocs/orca \
+ --with-html-dir=$(sharedstatedir)/www/orca \
--disable-librrdtool
SPKG_CLASSES = none cswinitsmf
+PKGFILES_CSWorca-web = $(prefix)/apache2/.*
+PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.*
+PKGFILES_CSWorca-web += $(bindir)/orca
+PKGFILES_CSWorca-web += $(sysconfdir)/.*\.cfg
+PKGFILES_CSWorca-web += $(libdir)/perl/.*
+PKGFILES_CSWorca-web += $(mandir)/man1/orca\.1
+PKGFILES_CSWorca-web += /var/opt/csw/.*
+
include gar/category.mk
-post-install:
+post-install-modulated:
@ginstall -d $(DESTDIR)$(sysconfdir)/init.d
@ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator
@ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services
@$(MAKE_COOKIE)
+
+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 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,14 +1,8 @@
ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2
-1f3d702565394052096bf75229d656d5 download/CSWorca.gspec
-6958db760831c504e21947338d0cac33 download/CSWorca.depend
-9cef0b5c1675ebd7a5f4d1427b5cce27 download/CSWorca.prototype
+401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall
+03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove
72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init
a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml
23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator
4c74f4f1449fabd0838d0cd71678144c download/csworca_services
-029c3cdd385c06b30aed79ea7e6f553f download/CSWorca-web.gspec
-0390894875ef40b9b40b42bab9f9fdab download/CSWorca-web.depend
-7ea5b03e8ae1c4f017a2c775a0c10f98 download/CSWorca-web.prototype
-401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall
-03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove
ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.depend 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,5 +0,0 @@
-P CSWperl perl - A high-level, general-purpose programming language.
-P CSWpmtimedate pm_timedate - Parse date strings into time values
-P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets
-P CSWrrd rrdtool - Round Robin Database graphing tool
-P CSWapache2 apache2 - Apache 2.2 web server
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.gspec 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,4 +0,0 @@
-%var bitname orca_web
-%var pkgname CSWorca-web
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.prototype 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,36 +0,0 @@
-d none /opt/csw/apache2/share/htdocs/orca 0755 root bin
-d none /opt/csw/apache2/share/htdocs/orca/orcallator 0755 root bin
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/orca 0755 root bin
-d none /opt/csw/etc 0755 root bin
-f none /opt/csw/etc/orca_services.cfg.CSW=/opt/csw/etc/orca_services.cfg 0644 root bin
-f none /opt/csw/etc/orcallator.cfg.CSW=/opt/csw/etc/orcallator.cfg 0644 root bin
-f none /opt/csw/etc/procallator.cfg.CSW=/opt/csw/etc/procallator.cfg 0644 root bin
-f none /opt/csw/etc/winallator.cfg.CSW=/opt/csw/etc/winallator.cfg 0644 root bin
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/perl 0755 root bin
-d none /opt/csw/lib/perl/csw 0755 root bin
-d none /opt/csw/lib/perl/csw/Orca 0755 root bin
-f none /opt/csw/lib/perl/csw/Orca/Config.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/Constants.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/DataFile.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/HTMLFile.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/ImageFile.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/NewState.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/OldState.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/OpenFileHash.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/RRDFile.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/SourceFile.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/SourceFileIDs.pm 0644 root bin
-f none /opt/csw/lib/perl/csw/Orca/Utils.pm 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/orca.1 0644 root bin
-d none /var/opt/csw 0755 root bin
-d none /var/opt/csw/orca 0755 root bin
-d none /var/opt/csw/orca/rrd 0755 root bin
-d none /var/opt/csw/orca/rrd/orcallator 0755 root bin
-i copyright=CSWorca-web.copyright
-i depend=CSWorca-web.depend
-i pkginfo=CSWorca-web.pkginfo
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.depend
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca.depend 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,8 +0,0 @@
-P CSWcswclassutils cswclassutils - CSW class action utilities
-P CSWsetoolkit setoolkit - A system performance monitoring tool
-P CSWperl perl - A high-level, general-purpose programming language.
-P CSWpmtimedate pm_timedate - Parse date strings into time values
-P CSWpmmathinterpolate pm_mathinterpolate - Useful routines for interpolating data sets
-P CSWrrd rrdtool - Round Robin Database graphing tool
-P CSWgawk gawk - GNU AWK
-P CSWbzip2 bzip2 - a high-quality block-sorting file compressor
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.gspec
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca.gspec 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,9 +0,0 @@
-%var bitname orca
-%var pkgname CSWorca
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
-%prototype:merge
-f cswinitsmf /opt/csw/etc/init.d/csworcallator 0755 root bin
-f cswinitsmf /opt/csw/etc/init.d/csworca_services 0755 root bin
-%depend:merge
-P CSWcswclassutils cswclassutils - CSW class action utilities
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca.prototype
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 08:40:04 UTC (rev 7002)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca.prototype 2009-10-29 09:04:27 UTC (rev 7003)
@@ -1,26 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/orca_services_running 0755 root bin
-f none /opt/csw/bin/orcallator_column 0755 root bin
-f none /opt/csw/bin/orcallator_running 0755 root bin
-f none /opt/csw/bin/procallator 0755 root bin
-f none /opt/csw/bin/restart_orca_services 0755 root bin
-f none /opt/csw/bin/restart_orcallator 0755 root bin
-f none /opt/csw/bin/start_orca_services 0755 root bin
-f none /opt/csw/bin/start_orcallator 0755 root bin
-f none /opt/csw/bin/stop_orca_services 0755 root bin
-f none /opt/csw/bin/stop_orcallator 0755 root bin
-d none /opt/csw/etc 0755 root bin
-f none /opt/csw/etc/orca_services.cfg 0644 root bin
-d none /opt/csw/etc/init.d 0755 root bin
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/orca 0755 root bin
-f none /opt/csw/lib/orca/orcallator.se 0644 root bin
-d none /opt/csw/libexec 0755 root bin
-f none /opt/csw/libexec/orca_services 0755 root bin
-d none /var/opt/csw 0755 root bin
-d none /var/opt/csw/orca 0755 root bin
-d none /var/opt/csw/orca/orcallator 0755 root bin
-d none /var/opt/csw/orca/orca_services 0755 root bin
-i copyright=CSWorca.copyright
-i depend=CSWorca.depend
-i pkginfo=CSWorca.pkginfo
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