[csw-devel] SF.net SVN: gar:[20856] csw/mgar/pkg/sar2rrd/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20856
          http://gar.svn.sourceforge.net/gar/?rev=20856&view=rev
Author:   dmichelsen
Date:     2013-04-23 15:59:14 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
sar2rrd/trunk: Update to 2.6.2 and latest standards

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

Modified: csw/mgar/pkg/sar2rrd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sar2rrd/trunk/Makefile	2013-04-23 15:52:51 UTC (rev 20855)
+++ csw/mgar/pkg/sar2rrd/trunk/Makefile	2013-04-23 15:59:14 UTC (rev 20856)
@@ -1,5 +1,5 @@
 NAME = sar2rrd
-VERSION = 2.5
+VERSION = 2.6.2
 GARTYPE = v2
 
 DESCRIPTION = Generate RRDTool graphs from sar output
@@ -13,33 +13,44 @@
 DISTFILES  = $(NAME)-$(VERSION).pl
 DISTFILES += $(NAME)-graph-$(VERSION).pl
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://www.trickytools.com/php/sar2rrd.php
 
-SPKG_SOURCEURL = http://www.trickytools.com/php/sar2rrd.php
+PACKAGES += CSWsar2rrd
+SPKG_DESC_CSWsar2rrd = Generate RRDTool graphs from sar output
+ARCHALL_CSWsar2rrd = 1
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWpm-rrdtool
+RUNTIME_DEP_PKGS += CSWpm-date-calc
+RUNTIME_DEP_PKGS += CSWpm-xml-simple
 
-RUNTIME_DEP_PKGS = CSWrrd CSWperl CSWpmdatecalc CSWpmxmlsimple
+# Perl modules can't be tracked with checkpkg
+CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWpm-date-calc
+CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWpm-xml-simple
+CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWpm-rrdtool
 
+REINPLACEMENTS += perl
+REINPLACE_MATCH_perl = /usr/bin/perl
+REINPLACE_WITH_perl = /opt/csw/bin/perl
+REINPLACE_FILES_perl += $(addprefix $(WORKDIR)/,$(DISTFILES))
+
+REINPLACEMENTS += rrdtool
+REINPLACE_MATCH_rrdtool = /usr/local/rrdtool/bin/rrdtool
+REINPLACE_WITH_rrdtool = $(bindir)/rrdtool
+REINPLACE_FILES_rrdtool += $(addprefix $(WORKDIR)/,$(DISTFILES))
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-ARCHALL = 1
-
-CHECKPKG_OVERRIDES_CSWsar2rrd += license-missing|/opt/csw/share/doc/sar2rrd/license
-CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWpmdatecalc
-CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWpmxmlsimple
-CHECKPKG_OVERRIDES_CSWsar2rrd += surplus-dependency|CSWrrd
-
 include gar/category.mk
 
-post-extract-modulated:
-	$(foreach F,$(DISTFILES),perl -pi \
-		-e 's,/usr/bin/perl,/opt/csw/bin/perl,; s,/usr/local/rrdtool/bin/rrdtool,/opt/csw/bin/rrdtool,' \
-		$(WORKDIR)/$F;)
-	@$(MAKECOOKIE)
+#post-extract-modulated:
+#	$(foreach F,$(DISTFILES),perl -pi \
+#		-e 's,/usr/bin/perl,/opt/csw/bin/perl,; s,/usr/local/rrdtool/bin/rrdtool,/opt/csw/bin/rrdtool,' \
+#		$(WORKDIR)/$F;)
+#	@$(MAKECOOKIE)
 
 install-custom:
 	ginstall -d $(DESTDIR)$(bindir)

Modified: csw/mgar/pkg/sar2rrd/trunk/checksums
===================================================================
--- csw/mgar/pkg/sar2rrd/trunk/checksums	2013-04-23 15:52:51 UTC (rev 20855)
+++ csw/mgar/pkg/sar2rrd/trunk/checksums	2013-04-23 15:59:14 UTC (rev 20856)
@@ -1,2 +1,2 @@
-edbc29f61620afa8ca9c298cca23eba2  sar2rrd-2.5.pl
-1374f9a1cb7786ea64815781345ee911  sar2rrd-graph-2.5.pl
+4fd33a243ae11d4283e83f50d631c0e6  sar2rrd-2.6.2.pl
+f000237f3687c233b7a7721f9c042dd0  sar2rrd-graph-2.6.2.pl

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