[csw-devel] SF.net SVN: gar:[17557] csw/mgar/pkg/evince/trunk/Makefile
Revision: 17557 http://gar.svn.sourceforge.net/gar/?rev=17557&view=rev Author: cgrzemba Date: 2012-03-26 08:37:18 + (Mon, 26 Mar 2012) Log Message: --- evince/trunk: add PACKAGING_PLATFORMS on build recipe Modified Paths: -- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile === --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 01:28:10 UTC (rev 17556) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 08:37:18 UTC (rev 17557) @@ -16,13 +16,15 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES += 0001-honor-aclocal_flags.patch - # GARFLAVOR = DBG # GARCOMPILER=GNU GARCOMPILER=SOS12U3 STRIP_LIBTOOL = 1 +PATCHFILES += 0001-honor-aclocal_flags.patch + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + CONFIGURE_ARGS = $(DIRPATHS) # CONFIGURE_ARGS += --enable-introspection # CONFIGURE_ARGS_DBG = --enable-debug 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
[csw-devel] SF.net SVN: gar:[17558] csw/mgar/pkg/evince/trunk/Makefile
Revision: 17558 http://gar.svn.sourceforge.net/gar/?rev=17558&view=rev Author: cgrzemba Date: 2012-03-26 09:02:04 + (Mon, 26 Mar 2012) Log Message: --- evince/trunk: correct typo EXTRA_LINKER_FLAGS Modified Paths: -- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile === --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 08:37:18 UTC (rev 17557) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:02:04 UTC (rev 17558) @@ -40,7 +40,7 @@ EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 EXTRA_LD_OPTIONS = -lm -EXTRA_LINKER_FLAG = -norunpath -xnorunpath +EXTRA_LINKER_FLAGS = -norunpath -xnorunpath # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. 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
[csw-devel] SF.net SVN: gar:[17559] csw/mgar/pkg/evince/trunk/Makefile
Revision: 17559 http://gar.svn.sourceforge.net/gar/?rev=17559&view=rev Author: cgrzemba Date: 2012-03-26 09:33:44 + (Mon, 26 Mar 2012) Log Message: --- evince/trunk: add main package Modified Paths: -- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile === --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:02:04 UTC (rev 17558) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:33:44 UTC (rev 17559) @@ -93,6 +93,7 @@ SPKG_DESC_CSWevince-dev += $(DESCRIPTION), development files PKGFILES_CSWevince-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWevince SPKG_DESC_CSWevince += $(DESCRIPTION), base RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2 RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2 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
[csw-devel] SF.net SVN: gar:[17560] csw/mgar/pkg/evince/trunk/Makefile
Revision: 17560 http://gar.svn.sourceforge.net/gar/?rev=17560&view=rev Author: cgrzemba Date: 2012-03-26 10:33:08 + (Mon, 26 Mar 2012) Log Message: --- evince/trunk: correct runtime dependencies and discouraged-path-in-pkgmap because of scrollkeeper location Modified Paths: -- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile === --- csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 09:33:44 UTC (rev 17559) +++ csw/mgar/pkg/evince/trunk/Makefile 2012-03-26 10:33:08 UTC (rev 17560) @@ -121,44 +121,117 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib -RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWevince += CSWfconfig -RUNTIME_DEP_PKGS_CSWevince += CSWftype2 -RUNTIME_DEP_PKGS_CSWevince += CSWgconf2 -RUNTIME_DEP_PKGS_CSWevince += CSWggettextrt -RUNTIME_DEP_PKGS_CSWevince += CSWglib2 -RUNTIME_DEP_PKGS_CSWevince += CSWgnomekeyring RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWevince += CSWgtk2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibatk -RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo -RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus -RUNTIME_DEP_PKGS_CSWevince += CSWlibglade2 -RUNTIME_DEP_PKGS_CSWevince += CSWlibice -RUNTIME_DEP_PKGS_CSWevince += CSWlibsm -RUNTIME_DEP_PKGS_CSWevince += CSWlibx11 -RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2 RUNTIME_DEP_PKGS_CSWevince += CSWnautilus RUNTIME_DEP_PKGS_CSWevince += CSWpango -RUNTIME_DEP_PKGS_CSWevince += CSWtiff -RUNTIME_DEP_PKGS_CSWevince += CSWzlib -RUNTIME_DEP_PKGS_CSWevince += CSWdbus -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus -# Shared MIME info is needed to detect file types -RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo # Solaris10 paths: these are resuts of cmd: # $ scrollkeeper-config --pkglocalstatedir -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_cl.xml -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/TOC -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/index -CHECKPKG_OVERRIDES_CSWevince += bad-location-of-file|file=/var/lib/scrollkeeper/scrollkeeper_docs +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/TOC +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/am/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/az/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/be/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/ca/scrollkeeper_extended_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs/scrollkeeper_cl.xml +CHECKPKG_OVERRIDES_CSWevince += discouraged-path-in-pkgmap|/opt/csw/var/lib/scrollkeeper/cs/scrollkeeper_extended_cl.xml +CHECKP
[csw-devel] SF.net SVN: gar:[17561] csw/mgar/pkg/ganglia/trunk/Makefile
Revision: 17561 http://gar.svn.sourceforge.net/gar/?rev=17561&view=rev Author: d_pocock Date: 2012-03-26 11:13:22 + (Mon, 26 Mar 2012) Log Message: --- ganglia: add dependency on session module Modified Paths: -- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile === --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 10:33:08 UTC (rev 17560) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:13:22 UTC (rev 17561) @@ -74,11 +74,13 @@ RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2-modphp5 CSWrrdtool RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-gd RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-json +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWphp5-session CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWgangliagmetad CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWrrdtool CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-gd CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-json +CHECKPKG_OVERRIDES_CSWgangliaweb += surplus-dependency|CSWphp5-session # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 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
[csw-devel] SF.net SVN: gar:[17562] csw/mgar/pkg/scrollkeeper/trunk/Makefile
Revision: 17562 http://gar.svn.sourceforge.net/gar/?rev=17562&view=rev Author: cgrzemba Date: 2012-03-26 11:14:52 + (Mon, 26 Mar 2012) Log Message: --- scrollkeeper/trunk: update build recipe for new localstatedir and runtime dependencies Modified Paths: -- csw/mgar/pkg/scrollkeeper/trunk/Makefile Modified: csw/mgar/pkg/scrollkeeper/trunk/Makefile === --- csw/mgar/pkg/scrollkeeper/trunk/Makefile2012-03-26 11:13:22 UTC (rev 17561) +++ csw/mgar/pkg/scrollkeeper/trunk/Makefile2012-03-26 11:14:52 UTC (rev 17562) @@ -3,7 +3,7 @@ CATEGORIES = utils GARTYPE = v2 -DESCRIPTION = a cataloging system for documentation on open systems +DESCRIPTION = Cataloging system for documentation on open systems define BLURB ScrollKeeper is a cataloging system for documentation on open systems. It manages documentation metadata (as specified by the Open Source Metadata @@ -29,7 +29,22 @@ PATCHFILES = Makefile.in.diff +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWscrollkeeper += CSWlibz1 + +PRESERVECONF = $(sysconfdir)/scrollkeeper.conf + +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/local|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/scrollkeeper.conf.5 +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/scrollkeeper.conf.5 +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-omfdirs=/opt/csw/share/omf:/usr/share/omf TEST_SCRIPTS = 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
[csw-devel] SF.net SVN: gar:[17563] csw/mgar/pkg/ganglia/trunk
Revision: 17563
http://gar.svn.sourceforge.net/gar/?rev=17563&view=rev
Author: d_pocock
Date: 2012-03-26 11:21:15 + (Mon, 26 Mar 2012)
Log Message:
---
ganglia: add dwoo_cache directory
Modified Paths:
--
csw/mgar/pkg/ganglia/trunk/Makefile
csw/mgar/pkg/ganglia/trunk/files/conf.php
Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===
--- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:14:52 UTC (rev 17562)
+++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:21:15 UTC (rev 17563)
@@ -183,6 +183,7 @@
PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.*
PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo_cache
PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo
PKGFILES_CSWgangliaweb += $(VARGANGLIA)/conf
@@ -204,6 +205,7 @@
PROTOTYPE_FILTER_CSWgangliaweb = awk '\
3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { 5 = "nobody"; 6 = "nogroup"
} \
+3 ~ /\/var\/opt\/csw\/ganglia\/dwoo_cache/ { 5 = "nobody"; 6 =
"nogroup" } \
3 ~ /\/var\/opt\/csw\/ganglia\/conf/ { 5 = "nobody"; 6 = "nogroup"
} \
{ print }'
@@ -251,6 +253,7 @@
endif
@ginstall -d $(DESTDIR)$(VARGANGLIA)/rrds
@ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo
+ @ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo_cache
@ginstall -d $(DESTDIR)$(VARGANGLIA)/conf
@ginstall -D $(WORKSRC)/gmond/gmond.conf.5
$(DESTDIR)$(mandir)/man5/gmond.conf.5
@ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1
Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php
===
--- csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 11:14:52 UTC (rev
17562)
+++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 11:21:15 UTC (rev
17563)
@@ -3,6 +3,7 @@
$conf['gmetad_root'] = "/var/opt/csw/ganglia";
$conf['rrds'] = "${conf['gmetad_root']}/rrds";
$conf['dwoo_compiled_dir'] = "${conf['gmetad_root']}/dwoo";
+$conf['dwoo_cache_dir'] = "${conf['gmetad_root']}/dwoo_cache";
$conf['views_dir'] = $conf['gmetad_root'] . '/conf';
$conf['conf_dir'] = $conf['gmetad_root'] . '/conf';
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
[csw-devel] SF.net SVN: gar:[17564] csw/mgar/pkg/scrollkeeper/trunk/Makefile
Revision: 17564 http://gar.svn.sourceforge.net/gar/?rev=17564&view=rev Author: cgrzemba Date: 2012-03-26 11:32:20 + (Mon, 26 Mar 2012) Log Message: --- scrollkeeper/trunk: add checkpkg hints Modified Paths: -- csw/mgar/pkg/scrollkeeper/trunk/Makefile Modified: csw/mgar/pkg/scrollkeeper/trunk/Makefile === --- csw/mgar/pkg/scrollkeeper/trunk/Makefile2012-03-26 11:21:15 UTC (rev 17563) +++ csw/mgar/pkg/scrollkeeper/trunk/Makefile2012-03-26 11:32:20 UTC (rev 17564) @@ -42,6 +42,8 @@ CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/doc/scrollkeeper-0.3.14/scrollkeeper-spec.txt CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/scrollkeeper.conf.5 CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/opt/csw/share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml +# path /usr/share/omf is not bad in general +CHECKPKG_OVERRIDES_CSWscrollkeeper += file-with-bad-content|/usr/share|root/etc/opt/csw/scrollkeeper.conf.CSW CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-omfdirs=/opt/csw/share/omf:/usr/share/omf 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
[csw-devel] SF.net SVN: gar:[17565] csw/mgar/pkg/ganglia/trunk
Revision: 17565 http://gar.svn.sourceforge.net/gar/?rev=17565&view=rev Author: d_pocock Date: 2012-03-26 16:56:50 + (Mon, 26 Mar 2012) Log Message: --- ganglia: update for building 3.3.5 Modified Paths: -- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Modified: csw/mgar/pkg/ganglia/trunk/Makefile === --- csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 11:32:20 UTC (rev 17564) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2012-03-26 16:56:50 UTC (rev 17565) @@ -1,5 +1,5 @@ NAME = ganglia -VERSION = 3.3.4 +VERSION = 3.3.5 VERSION_U = $(subst .,-,$(VERSION)) # Unit tests don't seem to run on Solaris, so it is disabled # As soon as Ganglia test cases are fixed to run on Solaris, Modified: csw/mgar/pkg/ganglia/trunk/checksums === --- csw/mgar/pkg/ganglia/trunk/checksums2012-03-26 11:32:20 UTC (rev 17564) +++ csw/mgar/pkg/ganglia/trunk/checksums2012-03-26 16:56:50 UTC (rev 17565) @@ -1 +1 @@ -d7a29490d20d51e0c8e71830dc50f99f ganglia-3.3.4.tar.gz +a5b1c98b7e460cc43be0c527f40fea1b ganglia-3.3.5.tar.gz 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
[csw-devel] SF.net SVN: gar:[17566] csw/mgar/pkg/ganglia/trunk/files/conf.php
Revision: 17566 http://gar.svn.sourceforge.net/gar/?rev=17566&view=rev Author: d_pocock Date: 2012-03-26 19:15:06 + (Mon, 26 Mar 2012) Log Message: --- ganglia: re-define other relative paths after changing conf_dir base Modified Paths: -- csw/mgar/pkg/ganglia/trunk/files/conf.php Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php === --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 16:56:50 UTC (rev 17565) +++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2012-03-26 19:15:06 UTC (rev 17566) @@ -7,5 +7,8 @@ $conf['views_dir'] = $conf['gmetad_root'] . '/conf'; $conf['conf_dir'] = $conf['gmetad_root'] . '/conf'; +$conf['overlay_events_file'] = $conf['conf_dir'] . "/events.json"; +$conf['overlay_events_color_map_file'] = $conf['conf_dir'] . "/event_color.json"; + $conf['rrdtool'] = "/opt/csw/bin/rrdtool"; ?> 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
[csw-devel] SF.net SVN: gar:[17567] csw/mgar/pkg/pca/trunk
Revision: 17567 http://gar.svn.sourceforge.net/gar/?rev=17567&view=rev Author: dmichelsen Date: 2012-03-26 20:01:44 + (Mon, 26 Mar 2012) Log Message: --- pca/trunk: Update to 20120326-01 Modified Paths: -- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile === --- csw/mgar/pkg/pca/trunk/Makefile 2012-03-26 19:15:06 UTC (rev 17566) +++ csw/mgar/pkg/pca/trunk/Makefile 2012-03-26 20:01:44 UTC (rev 17567) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20120119-01 +VERSION = 20120326-01 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/pca/trunk/checksums === --- csw/mgar/pkg/pca/trunk/checksums2012-03-26 19:15:06 UTC (rev 17566) +++ csw/mgar/pkg/pca/trunk/checksums2012-03-26 20:01:44 UTC (rev 17567) @@ -2,4 +2,4 @@ def9838b9f704ec17a32dd2aeec8bf02 clean 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm 9032b788b8a494082368ea0881146078 mkxref -889f960f31531cb79d04aa3c25d2bb46 pca-20120119-01 +25008a7f871b93f28806053fd9abfad3 pca-20120326-01 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
[csw-devel] SF.net SVN: gar:[17568] csw/mgar/gar/v2/lib/web/pkgdb_web.py
Revision: 17568 http://gar.svn.sourceforge.net/gar/?rev=17568&view=rev Author: wahwah Date: 2012-03-26 22:26:14 + (Mon, 26 Mar 2012) Log Message: --- pkgdb-web: Add a missing logging import Modified Paths: -- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py === --- csw/mgar/gar/v2/lib/web/pkgdb_web.py2012-03-26 20:01:44 UTC (rev 17567) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py2012-03-26 22:26:14 UTC (rev 17568) @@ -9,7 +9,9 @@ import web import sqlobject import json +import logging import pprint + from lib.python import models from lib.python import configuration from lib.python import pkgdb 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
[csw-devel] SF.net SVN: gar:[17569] csw/mgar/gar/v2/lib/web/pkgdb_web.py
Revision: 17569 http://gar.svn.sourceforge.net/gar/?rev=17569&view=rev Author: wahwah Date: 2012-03-26 22:26:58 + (Mon, 26 Mar 2012) Log Message: --- pkgdb-web: Correct the template path resolution The file is already in lib/web, so the path only needs the templates/ element. Modified Paths: -- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py === --- csw/mgar/gar/v2/lib/web/pkgdb_web.py2012-03-26 22:26:14 UTC (rev 17568) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py2012-03-26 22:26:58 UTC (rev 17569) @@ -52,10 +52,8 @@ ) urls = urls_html + urls_rest -render = web.template.render( -os.path.join( - os.path.split(__file__)[0], - "lib/web/templates/")) +templatedir = os.path.join(os.path.dirname(__file__), "templates/") +render = web.template.render(templatedir) class PkgStatsEncoder(json.JSONEncoder): 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
[csw-devel] SF.net SVN: gar:[17570] csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Revision: 17570 http://gar.svn.sourceforge.net/gar/?rev=17570&view=rev Author: wahwah Date: 2012-03-26 22:27:26 + (Mon, 26 Mar 2012) Log Message: --- integrate-catalogs: Display version transitions When tagging version changes, specify the exact version transition. Modified Paths: -- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py === --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py2012-03-26 22:26:58 UTC (rev 17569) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py2012-03-26 22:27:26 UTC (rev 17570) @@ -82,8 +82,11 @@ upgrade_# #end if $catalogname# - # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] + # $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] # +#if $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["type"] == 'version' +$diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["from"]["version"] to $diffs_by_catalogname[$catalogname]["updated_pkgs"][0][2]["to"]["version"] #end if +#end if #end for """ 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
[csw-devel] SF.net SVN: gar:[17571] csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Revision: 17571
http://gar.svn.sourceforge.net/gar/?rev=17571&view=rev
Author: wahwah
Date: 2012-03-26 22:27:53 + (Mon, 26 Mar 2012)
Log Message:
---
integrate-catalogs: Display msg when loading JSON
Just to give the user a sense of what's happening.
Modified Paths:
--
csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py
===
--- csw/mgar/gar/v2/lib/python/integrate_catalogs.py2012-03-26 22:27:26 UTC
(rev 17570)
+++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py2012-03-26 22:27:53 UTC
(rev 17571)
@@ -188,6 +188,7 @@
catrel_to = options.catrel_to
if options.from_json:
with open(options.from_json, "rb") as fd:
+ logging.info("Loading %s", options.from_json)
diffs_by_catalogname = json.load(fd)
else:
diffs_by_catalogname = GetDiffsByCatalogname(
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
[csw-devel] SF.net SVN: gar:[17572] csw/mgar/pkg/gcc4/trunk
Revision: 17572 http://gar.svn.sourceforge.net/gar/?rev=17572&view=rev Author: wahwah Date: 2012-03-27 05:45:48 + (Tue, 27 Mar 2012) Log Message: --- gcc4/trunk: version bump to 4.7.0, build for sparcv8+ by default Modified Paths: -- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile === --- csw/mgar/pkg/gcc4/trunk/Makefile2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/gcc4/trunk/Makefile2012-03-27 05:45:48 UTC (rev 17572) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.6.3 +VERSION = 4.7.0 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') @@ -72,12 +72,15 @@ # there could be some abstractions in gar.conf.mk, but at the moment there # aren't so let's specify architectures by hand. # -# This avoids the sparcv8+ binaries. -CPU_sparc_32 = v8 +# // This avoids the sparcv8+ binaries. +# We no longer avoid sparcv8+ binaries. +ISA_DEFAULT_sparc = sparcv8plus +CPU_sparc_32 = v9 CPU_sparc_64 = v9 CPU_i386_32 = i386 CPU_i386_64 = x86-64 + CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) @@ -484,7 +487,7 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += discouraged-path-in-pkgmap # It needs the core compiler. CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_CSWgcc4ada += file-with-bad-content +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += file-with-bad-content RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 Modified: csw/mgar/pkg/gcc4/trunk/checksums === --- csw/mgar/pkg/gcc4/trunk/checksums 2012-03-26 22:27:53 UTC (rev 17571) +++ csw/mgar/pkg/gcc4/trunk/checksums 2012-03-27 05:45:48 UTC (rev 17572) @@ -1 +1 @@ -773092fe5194353b02bb0110052a972e gcc-4.6.3.tar.bz2 +2a0f1d99fda235c29d40b561f81d9a77 gcc-4.7.0.tar.bz2 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
