Revision: 20083 http://gar.svn.sourceforge.net/gar/?rev=20083&view=rev Author: wahwah Date: 2013-01-11 09:47:15 +0000 (Fri, 11 Jan 2013) Log Message: ----------- collectd/trunk: Update to 5.2.0, added init script from Favoretti on IRC
Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/collectd/trunk/files/collectd-init-csw Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 09:00:38 UTC (rev 20082) +++ csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 09:47:15 UTC (rev 20083) @@ -1,7 +1,7 @@ # $Id$ # NAME = collectd -VERSION = 5.1.0 +VERSION = 5.2.0 GARTYPE = v2 DESCRIPTION = Collects sistema performance statistics periodically @@ -10,16 +10,18 @@ MASTER_SITES = http://collectd.org/files/ DISTFILES = $(DISTNAME).tar.gz +DISTFILES += collectd-init-csw PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 VENDOR_URL = http://collectd.org/ -PATCHFILES += 0001-work-around-the-s_addr-macro.patch +# PATCHFILES += 0001-work-around-the-s_addr-macro.patch BUILD64 = 1 BUILD_DEP_PKGS += CSWlibgcrypt-dev EXTRA_CPPFLAGS = -DSOLARIS2=10 -D__EXTENSIONS__ +EXTRA_LINKER_FLAGS = -R/opt/csw/lib/collectd -R/usr/openwin/lib -lrt GARCOMPILER = GNU @@ -28,40 +30,47 @@ CONFIGURE_ARGS += --disable-nfs CONFIGURE_ARGS += --disable-zfs_arc -PACKAGES += CSWlibcollectdclient0 -PKGFILES_CSWlibcollectdclient0 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibcollectdclient0 += $(DESCRIPTION), libcollectdclient.so.0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient0 -RUNTIME_DEP_PKGS_CSWlibcollectdclient0 += CSWlibgcc-s1 +PACKAGES += CSWlibcollectdclient1 +PKGFILES_CSWlibcollectdclient1 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibcollectdclient1 += $(DESCRIPTION), libcollectdclient.so.1 +RUNTIME_DEP_PKGS_CSWlibcollectdclient1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcollectdclient1 += CSWlibgcrypt11 +PACKAGES += CSWcollectd-dev +CATALOGNAME_CSWcollectd-dev = collectd_dev +SPKG_DESC_CSWcollectd-dev += $(DESCRIPTION), development files +PKGFILES_CSWcollectd-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWcollectd-dev += CSWlibcollectdclient1 + PACKAGES += CSWcollectd SPKG_DESC_CSWcollectd += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibrrd-th4 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab6 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWcollectd += CSWperl -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5 CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/collectd.1 CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/collectd-unixsock.5 +INITSMF = $(sysconfdir)/init\.d/collectd + include gar/category.mk post-install-modulated: ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3 cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3 + grm $(DESTDIR)/opt/csw/lib/perl5/sun4-solaris-thread-multi/perllocal.pod rmdir $(DESTDIR)/opt/csw/man/man3 - grm -v $(DESTDIR)/opt/csw/lib/perl/*/perllocal.pod + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(WORKDIR)/collectd-init-csw $(DESTDIR)$(sysconfdir)/init.d/collectd $(MAKECOOKIE) Modified: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums 2013-01-11 09:00:38 UTC (rev 20082) +++ csw/mgar/pkg/collectd/trunk/checksums 2013-01-11 09:47:15 UTC (rev 20083) @@ -1 +1 @@ -adc58a0d448a359ecf737da9398898c6 collectd-5.1.0.tar.gz +c0b4b94ffc9be540e4392aee64c4a42c collectd-5.2.0.tar.gz Added: csw/mgar/pkg/collectd/trunk/files/collectd-init-csw =================================================================== --- csw/mgar/pkg/collectd/trunk/files/collectd-init-csw (rev 0) +++ csw/mgar/pkg/collectd/trunk/files/collectd-init-csw 2013-01-11 09:47:15 UTC (rev 20083) @@ -0,0 +1,42 @@ +#!/sbin/sh + +PIDFILE=/var/opt/csw/run/collectd.pid +DAEMON=/opt/csw/sbin/collectd + +. /lib/svc/share/smf_include.sh + +case "$1" in + start) + if [ -f $PIDFILE ] ; then + echo "Already running. Stale PID file?" + PID=`cat $PIDFILE` + echo "$PIDFILE contains $PID" + ps -p $PID + exit $SMF_EXIT_ERR_FATAL + fi + $DAEMON + if [ $? -ne 0 ] ; then + echo $DAEMON faild to start + exit $SMF_EXIT_ERR_FATAL + fi + ;; + stop) + PID=`cat $PIDFILE 2>/dev/null` + kill -15 $PID 2>/dev/null + pwait $PID 1> /dev/null 2>/dev/null + ;; + restart) + $0 stop + $0 start + ;; + status) + ps -ef | grep collectd | grep -v status | grep -v grep + ;; + *) + echo "Usage: $0 [ start | stop | restart | status ]" + exit 1 + ;; +esac + + +exit $SMF_EXIT_OK This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel