From idogan23 at users.sourceforge.net Sun May 1 14:04:33 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 01 May 2011 12:04:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14477] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 14477 http://gar.svn.sourceforge.net/gar/?rev=14477&view=rev Author: idogan23 Date: 2011-05-01 12:04:33 +0000 (Sun, 01 May 2011) Log Message: ----------- nsd: bump version to 3.2.8 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2011-04-30 02:16:23 UTC (rev 14476) +++ csw/mgar/pkg/nsd/trunk/Makefile 2011-05-01 12:04:33 UTC (rev 14477) @@ -1,5 +1,5 @@ NAME = nsd -VERSION = 3.2.7 +VERSION = 3.2.8 CATEGORIES = server DESCRIPTION = An authoritative only non-recursive name server Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2011-04-30 02:16:23 UTC (rev 14476) +++ csw/mgar/pkg/nsd/trunk/checksums 2011-05-01 12:04:33 UTC (rev 14477) @@ -1 +1 @@ -b5aca8a207f77db566b08db25bf77d74 nsd-3.2.7.tar.gz +963c2123853e7759ffb772da40c68838 nsd-3.2.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun May 1 14:57:11 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 01 May 2011 12:57:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14478] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 14478 http://gar.svn.sourceforge.net/gar/?rev=14478&view=rev Author: idogan23 Date: 2011-05-01 12:57:11 +0000 (Sun, 01 May 2011) Log Message: ----------- unbound: bump version to 1.4.9 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2011-05-01 12:04:33 UTC (rev 14477) +++ csw/mgar/pkg/unbound/trunk/Makefile 2011-05-01 12:57:11 UTC (rev 14478) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.8 +VERSION = 1.4.9 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver define BLUR Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2011-05-01 12:04:33 UTC (rev 14477) +++ csw/mgar/pkg/unbound/trunk/checksums 2011-05-01 12:57:11 UTC (rev 14478) @@ -1 +1 @@ -526898f2375b6ca507bee917ff9c21e0 unbound-1.4.8.tar.gz +7079e75210c656761d3804a9f2ac7b9f unbound-1.4.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun May 1 18:35:35 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 01 May 2011 16:35:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14479] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 14479 http://gar.svn.sourceforge.net/gar/?rev=14479&view=rev Author: idogan23 Date: 2011-05-01 16:35:35 +0000 (Sun, 01 May 2011) Log Message: ----------- libldns: renamed devel package from CSWlibldnsdevel to CSWlibldns-devel Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2011-05-01 12:57:11 UTC (rev 14478) +++ csw/mgar/pkg/libldns/trunk/Makefile 2011-05-01 16:35:35 UTC (rev 14479) @@ -17,13 +17,13 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGES = CSWlibldns1 CSWlibldnsdevel +PACKAGES = CSWlibldns1 CSWlibldns-devel CATALOGNAME_CSWlibldns1 = libldns1 -CATALOGNAME_CSWlibldnsdevel = libldns_devel +CATALOGNAME_CSWlibldns-devel = libldns_devel SPKG_DESC_CSWlibldns1 = $(DESCRIPTION) -SPKG_DESC_CSWlibldnsdevel = $(DESCRIPTION) development package -CHECKPKG_OVERRIDES_CSWlibldnsdevel += surplus-dependency|CSWlibldns1 +SPKG_DESC_CSWlibldns-devel = $(DESCRIPTION) development package +CHECKPKG_OVERRIDES_CSWlibldns-devel += surplus-dependency|CSWlibldns1 SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ @@ -42,10 +42,10 @@ EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis RUNTIME_DEP_PKGS_CSWlibldns1 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibldnsdevel += CSWlibldns1 +RUNTIME_DEP_PKGS_CSWlibldns-devel += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns -INCOMPATIBLE_PKGS_CSWlibldnsdevel = CSWldnsdevel +INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWldnsdevel PATCHFILES = CSWldns.doxyparse.diff @@ -63,7 +63,486 @@ TEST_TARGET = -PKGFILES_CSWlibldnsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibldns-devel = $(PKGFILES_DEVEL) PKGFILES_CSWlibldnsrt = $(PKGFILES_RT) +# We are replaceing CSWlibldnsdevel by CSWlibldns-devel +INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWlibldnsdevel + +# Temporary, until CSWlibldnsdevel is removed from the catalog +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_is_subdomain.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_pop_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_create_nsecs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_cmp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_create_rrsigs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_upcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/dnssec.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_set_adcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_compare_ds.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_list_hosts_frm_fp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_hex.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_set_nsec.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_add_empty_nonterminals.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_notime.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rrsig2buffer_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr2canonical.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_new_frm_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2native_sockaddr_storage.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_set_key_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/keys.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_rsa_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_str_absolute.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_protocol.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt2str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_cd.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_edns_udp_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_apl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns_extended_rcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_bskipcs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_export.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_nscount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_descriptor_field_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_remaining.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_octet.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_compare.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_str2period.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_ra.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_status.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_no_sig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key2str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns_udp_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/net.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt2buffer_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_set_flags.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp_l.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_set_capacity.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_expiration.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_verify_denial.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_pop_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_push_rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_query_new_frm_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_ad.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_fskipcs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/rbtree.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_id.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_find_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_add_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new_frm_fp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/sha2.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_arcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_native2rdf_int16_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_new_frm_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_deep_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_reply_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_int16.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_inception.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_owner.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rdata2buffer_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_verify_denial_nsec3.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns_version.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_aaaa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_tc.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_errorstr_by_id.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_u16.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_mark_glue.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_list_hosts_frm_file.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_clone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_status_ok.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/doc/libldns_devel/license|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_ttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_pubkey_owner.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_question.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_expiration.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_wks.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_qdcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_descriptor_minimum.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/tsig.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_native2rdf_int16.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_send.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_clear.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_set_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_end.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_tsig_sign.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_owner.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_key_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_opcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_ancount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_pubkey_owner.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_mx_preference.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_b64.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/util.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u8_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_ipseckey.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_compress.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/wire2host.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u32_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_edns_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_tsig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_sig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_int16_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_origttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_keytag.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_new_frm_fp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_push_rr_list.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_cat.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_buf2rsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_answerfrom.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_wire2rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_hmac_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_id.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_soa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_ra.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_node_next_nonglue.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_label.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_set_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrs_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_nscount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/str2host.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_origttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/host2str.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_str_remove_comment.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_hmac_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_expiration.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/libldns.so|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_authority.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/packet.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/dname.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_label_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_pop_rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u16.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_rr_list_by_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_zocount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig_dsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_pkt_tsig_add.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_dsa_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrs_add_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_interval.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt2wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_tcp_connect.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_ancount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_edns_z.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_set_limit.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_push_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig_keylist.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_buf2dsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2native_int32.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp_rsa_l.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_new_frm_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_class_by_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_native2rdf_int8.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_get_rcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_keytag.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrs_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_rrs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_type_by_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/host2wire.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_qr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u32.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_sig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_dnskey_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/sparcv8plus/libldns.so|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_set_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_tcp_send_query.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_begin.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_sign_public_rsamd5.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_flags.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_bgetc.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_querytime.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_set_upcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr2wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_edns_extended_rcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u16_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_remove_signatures.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_new_frm_fp_l.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/rr.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_rewind.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_bget_token.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_position.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_mx_exchange.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_flip.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_list_hosts_frm_fp_l.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_origttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_list_addr_by_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_cat_clone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_aa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_sign_public_rsasha1.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_section_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_signame.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_string.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_sign.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_fget_token.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_aa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_class.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_names_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_qr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_edns_version.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_set_position.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_expiration.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_print_sm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_set_rrs.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_contains_keys.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_new_frm_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_dsa_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_prcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_depth.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_clone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/zone.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/sha1.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_new_frm_fp.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_set_prcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_deep_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_rr_list_by_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_string_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_set_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp_dsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_rd.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pktheader2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_skip.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_answer.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain_struct.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_set_rr_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_reserve.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_label_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_typecovered.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/sparcv9/libldns.so|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_add_parent.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_u16_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr2str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_qdcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_unknown.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_rr_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_section.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_sign_public_dsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_limit.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_wire2dname.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_remaining_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/higher.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_cd.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer2pkt_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_query_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_name.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_set_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_tc.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_available_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_set_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_wire2pkt.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_resolver_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_period.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_descript.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_getaddrinfo.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key2rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_available.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2native_int8.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_ad.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_glue_rr_list.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_calc_keytag.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain_deep_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_pkt_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_sort.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_set_soa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/buffer.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr2buffer_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrs_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_rd_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_typecovered.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_uncompressed_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_deep_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_get_section_clone.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_pop_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_cat.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_find_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_class.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_flags.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig_rsamd5.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/dnssec_sign.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_adcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_alg.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_descriptor_maximum.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_ds_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/rr_functions.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_inception.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_sign_public.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_address_reverse.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_inception.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/dnssec_verify.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname_left_chop.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_wire2rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_create_nsec.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_origttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_a.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_capacity.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_push_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_nsap.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_update_set_zocount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_rcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_new_frm_data.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_keytag.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_compare.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_tsig.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp_dsa_l.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_printf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_inception.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new_frm_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_sort.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_answerfrom.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2native_int16.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_ttl.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_labels.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_verify.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_u8_at.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/rdata.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/bin/ldns-config|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_compare.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_is_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_tsig_verify.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_add_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/parse.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_keytag.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_name_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_tsigtime.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_list_push_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt2buffer_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_new_frm_str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rd_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_get_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_descriptor.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_arcount.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_rr2ds.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/dnssec_zone.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_current.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/update.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_get_class.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_set_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_new_frm_fp_rsa.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_rr_list_by_name_and_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_add_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_zone_sign_nsec3.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_native2rdf_int32.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_list2str.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/error.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_rd.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_build_data_chain.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_status.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_loc.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_get_opcode.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/common.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname2canonical.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf_set_size.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_signame.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_rsa_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_set_flags.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_class.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_get_rr_list_name_by_addr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_write_u8.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_data_chain_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_set_push_rr.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig_keylist_notime.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_rrsig_labels.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2native_time_t.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dname.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_additional.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_edns_z.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/ldns.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_tcp_read_wire.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_key_algorithm.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_rr_count.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_ns_nsdname.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_init_random.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/include/ldns/resolver.h|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_querytime.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_key.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_buffer_read_u8.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/bin/sparcv8plus+vis/ldns-config|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_trust_tree_print.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_zone_new.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_dnskey_set_protocol.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_verify_rrsig_rsasha1.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_pkt_set_flags.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rdf2buffer_str_nsec.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_rrsets_free.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/sparcv8plus+vis/libldns.so|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new_frm_type.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_normal_rrset.3|CSWlibldns-devel|CSWlibldnsdevel + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun May 1 18:41:27 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 1 May 2011 17:41:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[14479] csw/mgar/pkg/libldns/trunk/Makefile In-Reply-To: References: Message-ID: 2011/5/1 : > +# We are replaceing CSWlibldnsdevel by CSWlibldns-devel > +INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWlibldnsdevel If you want to rename a package, there is a dedicated functionality in GAR: OBSOLETED_BY_CSWlibldns-dev = CSWlibldnsdevel From bdwalton at users.sourceforge.net Sun May 1 20:07:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 May 2011 18:07:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14480] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14480 http://gar.svn.sourceforge.net/gar/?rev=14480&view=rev Author: bdwalton Date: 2011-05-01 18:07:22 +0000 (Sun, 01 May 2011) Log Message: ----------- php5/trunk: remove a pile of old cruft from the php5 postinstall Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 16:35:35 UTC (rev 14479) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 18:07:22 UTC (rev 14480) @@ -314,8 +314,9 @@ endif # Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 +#SKIPTEST = 1 #ENABLE_CHECK = 0 +TEST_TARGET = test include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 16:35:35 UTC (rev 14479) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 18:07:22 UTC (rev 14480) @@ -2,153 +2,13 @@ PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin -if [ ! -f _PHPETCDIR_/pear.conf ]; then - cp -p _PHPETCDIR_/pear.conf.CSW _PHPETCDIR_/pear.conf - _PHPBINDIR_/pear config-set php_ini _PHPINIFILE_ -else - echo "_PHPETCDIR_/pear.conf already exists." - echo "Updateing _PHPETCDIR_/pear.conf with current directories" - _PHPBINDIR_/pear config-set php_ini _PHPINIFILE_ - _PHPBINDIR_/pear config-set php_bin _PHPBINDIR_ - _PHPBINDIR_/pear config-set php_doc _PHPLIBDIR_/doc - _PHPBINDIR_/pear config-set cfg_dir _PHPLIBDIR_/cfg - _PHPBINDIR_/pear config-set data_dir _PHPLIBDIR_/data - _PHPBINDIR_/pear config-set test_dir _PHPLIBDIR_/test - _PHPBINDIR_/pear config-set www_dir _PHPLIBDIR_/htdocs - _PHPBINDIR_/pear config-set sig_keydir _PHPETCDIR_/htdocs - _PHPBINDIR_/pear config-set php_dir _PHPLIBDIR_ - _PHPBINDIR_/pear config-set php_ext _PHPEXTDIR_ -fi -if [ ! -f _PHPINIFILE_ ]; then - cp -p _PHPINIFILE_.CSW _PHPINIFILE_ -else - echo "_PHPINIFILE_ already exists" - extdir="_PHPEXTDIR_" - curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' _PHPINIFILE_` +extdir="no-debug-non-zts-20060613" +curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php5/php.ini` - if [ "_PHPEXTDIR_" != "$curextdir" ]; then - echo "updating extension_dir..." - perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,_PHPEXTDIR_," _PHPINIFILE_ - - old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' _PHPINIFILE_`" - new_pkgs='' - non_pkgs='' - for ext in `echo ${old_list}`; do - if grep "extension=$ext" _PHPINIFILE_.CSW; then - new_pkgs="${new_pkgs} php5_${ext}" - else - non_pkgs="${non_pkgs} ${ext}" - fi - done - - cat << _EOT_ - -****************************************************************************** -* NOTICE: The existing _PHPINIFILE_ file is from an older version of PHP5. -* -* ************* PLEASE READ ************* -* -* Starting with php5-5.2.9,REV=2009.04.29 the CSW php5 suite has been -* broken out into seperate packages for the modules. -* -_EOT_ -if [ -n "${new_pkgs}" ]; then - cat << _EOT_ -* ************* PLEASE READ ************* -* -* Your existing config contains the following extensions -* that now have become external packages: -* -_EOT_ -cnt=1 -for name in `echo ${new_pkgs}`; do - if [ ${cnt} -eq 1 ]; then - echo "* \c" - fi - if [ `expr ${cnt} % 4` -ne 0 ]; then - echo "${name} \c" - cnt=`expr ${cnt} + 1` - else - echo "${name}" - cnt=1 - fi -done -if [ ${cnt} -ne 1 ]; then - echo +if [ "no-debug-non-zts-20060613" != "$curextdir" ]; then + echo "updating extension_dir..." + perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,no-debug-non-zts-20060613," /etc/opt/csw/php5/php.ini fi -cat << _EOT_ -* -* to keep the same functionality as the original install -* you will need to install them using pkg-get -* -* If you have issues with missing extensions, Please check -* the catalog for the missing extension before filing a bug report -* -_EOT_ -else - cat << _EOT_ -* ************* PLEASE READ ************* -* -* Your existing config does not contain any shared extensions -* that are now packages. If you have issues with missing extensions, -* Please Check the catalog for the missing extension before -* filing a bug report. -* -_EOT_ -fi -if [ -n "${non_pkgs}" ]; then - cat << _EOT_ -* ************* PLEASE READ ************* -* -* Your existing config contains the following extensions -* that are not part of CSW build: -* -_EOT_ -cnt=1 -for name in `echo ${non_pkgs}`; do - if [ ${cnt} -eq 1 ]; then - echo "* \c" - fi - if [ `expr ${cnt} % 4` -ne 0 ]; then - echo "${name} \c" - cnt=`expr ${cnt} + 1` - else - echo "${name}" - cnt=1 - fi -done -if [ ${cnt} -ne 1 ]; then - echo -fi -cat << _EOT_ -* -* Please verify they are still working after this upgrade. -* -_EOT_ -fi -cat << _EOT_ -****************************************************************************** -****************************************************************************** -* WARNING: Short open tag support in this release of CSWphp5 is DISABLED by -* default. If you rely on short open tag ( Revision: 14481 http://gar.svn.sourceforge.net/gar/?rev=14481&view=rev Author: idogan23 Date: 2011-05-01 19:34:59 +0000 (Sun, 01 May 2011) Log Message: ----------- ldnsdrill: bump version to 1.6.9 Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/Makefile csw/mgar/pkg/ldns_drill/trunk/checksums Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/Makefile 2011-05-01 18:07:22 UTC (rev 14480) +++ csw/mgar/pkg/ldns_drill/trunk/Makefile 2011-05-01 19:34:59 UTC (rev 14481) @@ -1,5 +1,5 @@ NAME = ldns_drill -VERSION = 1.6.8 +VERSION = 1.6.9 CATEGORIES = utils DESCRIPTION = A dig style dnssec aware dns debugging tool (ldns) Modified: csw/mgar/pkg/ldns_drill/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/checksums 2011-05-01 18:07:22 UTC (rev 14480) +++ csw/mgar/pkg/ldns_drill/trunk/checksums 2011-05-01 19:34:59 UTC (rev 14481) @@ -1 +1 @@ -17d15e0d185a6258eed2c3806d8fc7c5 ldns-1.6.8.tar.gz +fc9db99cfe7c9d7f86da8f53efdbbbd6 ldns-1.6.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ihsan at opencsw.org Sun May 1 21:42:26 2011 From: ihsan at opencsw.org (=?UTF-8?B?xLBoc2FuwqBEb8SfYW4=?=) Date: Sun, 01 May 2011 21:42:26 +0200 Subject: [csw-devel] SF.net SVN: gar:[14479] csw/mgar/pkg/libldns/trunk/Makefile In-Reply-To: References: Message-ID: <4DBDB7A2.2010405@opencsw.org> Am 01.05.2011 18:41, schrieb Maciej Blizi?ski: >> +# We are replaceing CSWlibldnsdevel by CSWlibldns-devel >> +INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWlibldnsdevel > > If you want to rename a package, there is a dedicated functionality in GAR: > > OBSOLETED_BY_CSWlibldns-dev = CSWlibldnsdevel Oh, that's handy. Thanks. :-) Besides the INCOMPATIBLE_PKGS does it handle also the file conflict report by checkpkg? Ihsan -- ihsan at dogan.ch http://blog.dogan.ch/ From bdwalton at users.sourceforge.net Sun May 1 22:03:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 May 2011 20:03:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14482] csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Message-ID: Revision: 14482 http://gar.svn.sourceforge.net/gar/?rev=14482&view=rev Author: bdwalton Date: 2011-05-01 20:03:14 +0000 (Sun, 01 May 2011) Log Message: ----------- php5/trunk: drop exit 0 from php5 postinstall which could mask errors Modified Paths: -------------- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 19:34:59 UTC (rev 14481) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 20:03:14 UTC (rev 14482) @@ -2,7 +2,6 @@ PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin - extdir="no-debug-non-zts-20060613" curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php5/php.ini` @@ -10,5 +9,3 @@ echo "updating extension_dir..." perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,no-debug-non-zts-20060613," /etc/opt/csw/php5/php.ini fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 1 22:07:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 May 2011 20:07:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14483] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14483 http://gar.svn.sourceforge.net/gar/?rev=14483&view=rev Author: bdwalton Date: 2011-05-01 20:07:19 +0000 (Sun, 01 May 2011) Log Message: ----------- php5/trunk: move extension build scripts for pdo modules to proper packages Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 20:03:14 UTC (rev 14482) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 20:07:19 UTC (rev 14483) @@ -170,18 +170,22 @@ PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.so +PKGFILES_CSWphp5-pdomysql = .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so +PKGFILES_CSWphp5-pdoodbc = .*extensions/pdo_odbc CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so +PKGFILES_CSWphp5-pdopgsql = .*extensions/pdo_pgsql CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo)) PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so +PKGFILES_CSWphp5-pdosqlite = .*extensions/pdo_sqlite CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pgsql,CSWlibpq)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon May 2 00:13:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 1 May 2011 23:13:56 +0100 Subject: [csw-devel] SF.net SVN: gar:[14479] csw/mgar/pkg/libldns/trunk/Makefile In-Reply-To: <4DBDB7A2.2010405@opencsw.org> References: <4DBDB7A2.2010405@opencsw.org> Message-ID: Em 01/05/2011 20:42, "?hsan Do?an" escreveu: > > Am 01.05.2011 18:41, schrieb Maciej Blizi?ski: > > >> +# We are replaceing CSWlibldnsdevel by CSWlibldns-devel > >> +INCOMPATIBLE_PKGS_CSWlibldns-devel = CSWlibldnsdevel > > > > If you want to rename a package, there is a dedicated functionality in GAR: > > > > OBSOLETED_BY_CSWlibldns-dev = CSWlibldnsdevel > > Oh, that's handy. Thanks. :-) > > Besides the INCOMPATIBLE_PKGS does it handle also the file conflict > report by checkpkg? If checkpkg reports file conflicts, the rename is probably not done right. The package you intend to remove should be created and be empty. You might not release the empty package, but it's still a better way of handling it than overriding errors. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bdwalton at users.sourceforge.net Mon May 2 00:25:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 May 2011 22:25:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14484] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14484 http://gar.svn.sourceforge.net/gar/?rev=14484&view=rev Author: bdwalton Date: 2011-05-01 22:25:18 +0000 (Sun, 01 May 2011) Log Message: ----------- php5/trunk: re-disable test suite (for now) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 20:07:19 UTC (rev 14483) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 22:25:18 UTC (rev 14484) @@ -318,7 +318,7 @@ endif # Disable Tests (report submitted to PHP QA) -#SKIPTEST = 1 +SKIPTEST = 1 #ENABLE_CHECK = 0 TEST_TARGET = test This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 03:23:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 01:23:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14485] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14485 http://gar.svn.sourceforge.net/gar/?rev=14485&view=rev Author: bdwalton Date: 2011-05-02 01:23:52 +0000 (Mon, 02 May 2011) Log Message: ----------- php5/trunk: change = to += for additions to the pdo pkgfiles statements Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 22:25:18 UTC (rev 14484) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-02 01:23:52 UTC (rev 14485) @@ -169,23 +169,23 @@ $(eval $(call php5_subpackage,pdo)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWmysql5rt CSWzlib CSWphp5-pdo)) -PKGFILES_CSWphp5-pdomysql = .*/lib/php/extensions/.*/pdo_mysql.so -PKGFILES_CSWphp5-pdomysql = .*extensions/pdo_mysql +PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so +PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo)) -PKGFILES_CSWphp5-pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.so -PKGFILES_CSWphp5-pdoodbc = .*extensions/pdo_odbc +PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so +PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo)) -PKGFILES_CSWphp5-pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.so -PKGFILES_CSWphp5-pdopgsql = .*extensions/pdo_pgsql +PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so +PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo)) -PKGFILES_CSWphp5-pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.so -PKGFILES_CSWphp5-pdosqlite = .*extensions/pdo_sqlite +PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so +PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pgsql,CSWlibpq)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 04:01:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 02:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14486] csw/mgar/gar/v2/bin/php5ext_build_scripts Message-ID: Revision: 14486 http://gar.svn.sourceforge.net/gar/?rev=14486&view=rev Author: bdwalton Date: 2011-05-02 02:01:38 +0000 (Mon, 02 May 2011) Log Message: ----------- make the php5 extension script builder run quietly Modified Paths: -------------- csw/mgar/gar/v2/bin/php5ext_build_scripts Modified: csw/mgar/gar/v2/bin/php5ext_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-05-02 01:23:52 UTC (rev 14485) +++ csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-05-02 02:01:38 UTC (rev 14486) @@ -1,7 +1,5 @@ #!/bin/bash -set -x - MERGEDIR=$1; shift PHP5MODS=opt/csw/php5/extensions PHP5EXTDIR=opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon May 2 11:21:54 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 02 May 2011 09:21:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14487] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 14487 http://gar.svn.sourceforge.net/gar/?rev=14487&view=rev Author: bonivart Date: 2011-05-02 09:21:54 +0000 (Mon, 02 May 2011) Log Message: ----------- memconf/trunk: Update to 2.18 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2011-05-02 02:01:38 UTC (rev 14486) +++ csw/mgar/pkg/memconf/trunk/Makefile 2011-05-02 09:21:54 UTC (rev 14487) @@ -1,5 +1,5 @@ NAME = memconf -VERSION = 2.17 +VERSION = 2.18 CATEGORIES = utils DESCRIPTION = Perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2011-05-02 02:01:38 UTC (rev 14486) +++ csw/mgar/pkg/memconf/trunk/checksums 2011-05-02 09:21:54 UTC (rev 14487) @@ -1,2 +1,2 @@ -b972422a206a4837eb1c34f1fbe9f236 memconf.gz -e9413ba46055e74fd9184b31e453471d memconf.man +7421a8b10a8a4523a245c2dd055631ea memconf.gz +423147c99408674d29fd161772335072 memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon May 2 12:50:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 02 May 2011 10:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14488] csw/mgar/pkg/sharutils/trunk/Makefile Message-ID: Revision: 14488 http://gar.svn.sourceforge.net/gar/?rev=14488&view=rev Author: wahwah Date: 2011-05-02 10:50:39 +0000 (Mon, 02 May 2011) Log Message: ----------- pkg/sharutils/trunk: Removing the separate uuencode package, renaming the binaries. Modified Paths: -------------- csw/mgar/pkg/sharutils/trunk/Makefile Modified: csw/mgar/pkg/sharutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sharutils/trunk/Makefile 2011-05-02 09:21:54 UTC (rev 14487) +++ csw/mgar/pkg/sharutils/trunk/Makefile 2011-05-02 10:50:39 UTC (rev 14488) @@ -30,17 +30,15 @@ SPKG_DESC_CSWsharutils = $(DESCRIPTION) CHECKPKG_OVERRIDES_CSWsharutils += file-with-bad-content|/usr/share|root/opt/csw/share/locale/es/LC_MESSAGES/sharutils.mo -PACKAGES += CSWuuencode -SPKG_DESC_CSWuuencode = Utility to encode and decode data -PKGFILES_CSWuuencode = $(bindir)/uu(en|de)code -RUNTIME_DEP_PKGS_CSWuuencode += CSWlibintl8 -# We won't be releasing CSWuuencode from this package. -CHECKPKG_OVERRIDES_CSWuuencode += file-collision - SKIPTEST ?= 1 include gar/category.mk +post-install-modulated: + gmv $(DESTDIR)$(bindir)/uuencode $(DESTDIR)$(bindir)/uuencode-sharutils + gmv $(DESTDIR)$(bindir)/uudecode $(DESTDIR)$(bindir)/uudecode-sharutils + @$(MAKECOOKIE) + post-merge: rm $(PKGROOT)$(libdir)/charset.alias @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 19:25:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 17:25:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14489] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14489 http://gar.svn.sourceforge.net/gar/?rev=14489&view=rev Author: bdwalton Date: 2011-05-02 17:25:30 +0000 (Mon, 02 May 2011) Log Message: ----------- bacula/trunk: make unique user/group entries for director and sd, only create group for fd Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 10:50:39 UTC (rev 14488) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 17:25:30 UTC (rev 14489) @@ -311,10 +311,12 @@ post-merge: @echo Adding user/group creation info... @(cd $(PKGROOT)/etc/opt/csw; \ - for p in director sd fd; do \ - mkdir -p pkg/CSWbacula-$$p; \ - echo "bacula:bacula:Bacula:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-$$p/cswusergroup; \ - done; \ + mkdir -p pkg/CSWbacula-director; \ + echo "bacula-dir:bacula:Bacula Director:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-director/cswusergroup; \ echo "bacula-dir 9101/tcp" > pkg/CSWbacula-director/services; \ - echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services; \ - echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services ) + mkdir -p pkg/CSWbacula-sd; \ + echo "bacula-sd:bacula:Bacula Storage Daemon:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-sd/cswusergroup; \ + echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ + mkdir -p pkg/CSWbacula-fd; \ + echo ":bacula::::::" > pkg/CSWbacula-fd/cswusergroup; \ + echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 20:38:24 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 18:38:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14490] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14490 http://gar.svn.sourceforge.net/gar/?rev=14490&view=rev Author: bdwalton Date: 2011-05-02 18:38:23 +0000 (Mon, 02 May 2011) Log Message: ----------- bacula/trunk: do not set group owner on var/opt/csw/bacula stuff, leave it as root Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 17:25:30 UTC (rev 14489) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 18:38:23 UTC (rev 14490) @@ -261,7 +261,6 @@ PROTOTYPE_MODIFIERS = usergroupfiles confgroup generalperms PROTOTYPE_FILES_usergroupfiles = /var/opt/csw/bacula.* PROTOTYPE_CLASS_usergroupfiles = ugfiles -PROTOTYPE_USER_usergroupfiles = bacula PROTOTYPE_GROUP_usergroupfiles = bacula PROTOTYPE_PERMS_usergroupfiles = 0770 PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 20:55:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 18:55:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14491] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14491 http://gar.svn.sourceforge.net/gar/?rev=14491&view=rev Author: bdwalton Date: 2011-05-02 18:55:37 +0000 (Mon, 02 May 2011) Log Message: ----------- bacula/trunk: set configure options to use unique uid for dir and sd Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 18:38:23 UTC (rev 14490) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 18:55:37 UTC (rev 14491) @@ -217,9 +217,9 @@ CONFIGURE_ARGS += --with-mon-fd-password=IEKXaPXrRO8BzJYBJueDJgkVsXzR/1cVvPNGJhZPrsHB CONFIGURE_ARGS += --with-mon-sd-password=e5fbjZnW+1hohTYFBfTXFe1KP7BIgCrAvY4fA4fg39TN # don't run as root except for the file daemon which will need those privs -CONFIGURE_ARGS += --with-dir-user=bacula +CONFIGURE_ARGS += --with-dir-user=bacula-dir CONFIGURE_ARGS += --with-dir-group=bacula -CONFIGURE_ARGS += --with-sd-user=bacula +CONFIGURE_ARGS += --with-sd-user=bacula-sd CONFIGURE_ARGS += --with-sd-group=bacula EXTRA_INC += $(includedir)/ncursesw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 21:49:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 19:49:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14492] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 14492 http://gar.svn.sourceforge.net/gar/?rev=14492&view=rev Author: bdwalton Date: 2011-05-02 19:49:44 +0000 (Mon, 02 May 2011) Log Message: ----------- cswclassutils/trunk: add auxgroups field to cswusergroup; mantis id 3861 Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2011-05-02 18:55:37 UTC (rev 14491) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2011-05-02 19:49:44 UTC (rev 14492) @@ -5,8 +5,10 @@ # $Id$ # # Written by Peter Bonivart +# Modified by Ben Walton # # 2009-02-10 First release +# 2011-04-29 Add support for auxgroups # # Documentation: http://wiki.opencsw.org/cswclassutils-package # @@ -171,6 +173,7 @@ shell="$5" create="$6" nopass="$7" + auxgroups="$8" if getent passwd $user > /dev/null; then echo User $user already exists @@ -186,10 +189,11 @@ [ -n "$dir" ] && dir="-d $dir" [ -n "$shell" ] && shell="-s $shell" [ -n "$create" ] && create="-m" + [ -n "$auxgroups" ] && auxgroups="-G $auxgroups" - debug_echo "/usr/sbin/useradd -g $uid $gcos $group $create $dir $shell $user" + debug_echo "/usr/sbin/useradd -g $uid $gcos $group $auxgroups $create $dir $shell $user" if /usr/sbin/useradd \ - -u $uid $gcos $group $create $dir $shell $user > /dev/null + -u $uid $gcos $group $auxgroups $create $dir $shell $user > /dev/null then echo User $user has been added else @@ -253,6 +257,7 @@ shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` nopass=`echo $i | awk -F':' '{print $8}'` + auxgroups=`echo $i | awk -F':' '{print $9}'` if [ -n "$group" ]; then create_group $group @@ -262,7 +267,7 @@ if [ -n "$user" ]; then create_user \ - "$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass" + "$user" "$group" "$gcos" "$dir" "$shell" "$create" "$nopass" "$auxgroups" else echo No user to create fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 2 21:56:08 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 May 2011 19:56:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14493] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14493 http://gar.svn.sourceforge.net/gar/?rev=14493&view=rev Author: bdwalton Date: 2011-05-02 19:56:08 +0000 (Mon, 02 May 2011) Log Message: ----------- bacula/trunk: put the bacula-sd account in sys group too (relies on update to cswusergroup cas) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 19:49:44 UTC (rev 14492) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-02 19:56:08 UTC (rev 14493) @@ -314,7 +314,7 @@ echo "bacula-dir:bacula:Bacula Director:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-director/cswusergroup; \ echo "bacula-dir 9101/tcp" > pkg/CSWbacula-director/services; \ mkdir -p pkg/CSWbacula-sd; \ - echo "bacula-sd:bacula:Bacula Storage Daemon:/var/opt/csw/bacula/:/bin/false:::NP" > pkg/CSWbacula-sd/cswusergroup; \ + echo "bacula-sd:bacula:Bacula Storage Daemon:/var/opt/csw/bacula/:/bin/false:::NP:sys" > pkg/CSWbacula-sd/cswusergroup; \ echo "bacula-sd 9103/tcp" > pkg/CSWbacula-sd/services; \ mkdir -p pkg/CSWbacula-fd; \ echo ":bacula::::::" > pkg/CSWbacula-fd/cswusergroup; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 3 02:02:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 03 May 2011 00:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14494] csw/mgar/pkg/php5/trunk Message-ID: Revision: 14494 http://gar.svn.sourceforge.net/gar/?rev=14494&view=rev Author: bdwalton Date: 2011-05-03 00:02:28 +0000 (Tue, 03 May 2011) Log Message: ----------- php5/trunk: drop a few legacy Makefile versions Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/Makefile.cswdir csw/mgar/pkg/php5/trunk/Makefile.php5dir Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-05-02 19:56:08 UTC (rev 14493) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-03 00:02:28 UTC (rev 14494) @@ -347,3 +347,5 @@ @perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* @$(MAKECOOKIE) +post-merge: + @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) Deleted: csw/mgar/pkg/php5/trunk/Makefile.cswdir =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.cswdir 2011-05-02 19:56:08 UTC (rev 14493) +++ csw/mgar/pkg/php5/trunk/Makefile.cswdir 2011-05-03 00:02:28 UTC (rev 14494) @@ -1,88 +0,0 @@ -NAME = php5 -VERSION = 5.2.11 -CATEGORIES = lang -SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') -DISTNAME = $(SF_PROJ)-$(VERSION) - -DESCRIPTION = A high-level scripting language. -define BLURB - PHP is a widely-used Open Source general-purpose scripting language that is - especially suited for Web development and can be embedded into HTML. Its - syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many - different platforms and can be used as a standalone executable or as a - module under a variety of Web servers. It has excellent support for - databases, XML, LDAP, IMAP, Java, various Internet protocols, and general - data manipulation, and is extensible via its powerful API. It is actively - developed and supported by a talented and energetic international team. - Numerous Open Source and commercial PHP-based application packages are - available. -endef - -MASTER_SITES = http://us.php.net/distributions/ -SPKG_SOURCEURL = http://www.php.net/ -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ - -DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall - -PACKAGES = CSWphp5 CSWphp5devel - -CATALOGNAME_CSWphp5 = php5 -SPKG_DESC_CSWphp5 = A High-Level Scripting Languages -CATALOGNAME_CSWphp5devel = php5_devel -SPKG_DESC_CSWphp5devel = Development files for php5 -RUNTIME_DEP_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv CSWpng CSWsqlite -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt CSWxpm CSWt1lib -RUNTIME_DEP_PKGS_CSWphp5 += CSWftype2 CSWgd CSWjpeg CSWlibmm -RUNTIME_DEP_PKGS_CSWphp5devel = CSWphp5 - -PKGFILES_CSWphp5devel = $(bindir)/php-config -PKGFILES_CSWphp5devel += $(bindir)/phpize -PKGFILES_CSWphp5devel += $(bindir)/peardev -PKGFILES_CSWphp5devel += $(libdir)/php/build/.* -PKGFILES_CSWphp5devel += $(includedir)/php/TSRM.* -PKGFILES_CSWphp5devel += $(includedir)/php/Zend.* -PKGFILES_CSWphp5devel += $(includedir)/php/include.* -PKGFILES_CSWphp5devel += $(includedir)/php/main.* -PKGFILES_CSWphp5devel += $(includedir)/php/regex.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/date.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/filter.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/libxml.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/pcre.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/spl.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/standard.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/xml.* -PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1 -PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 - -PATCHFILES += configure.diff -PATCHFILES += php-bug-45557-fix.diff - -# PHP Extensions -EXTDIRLIST = $(shell ls -d extensions/*) -include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) - -EXTRA_CFLAGS = -I$(prefix)/include/ncursesw - -NOISALIST = 1 -STRIP_LIBTOOL = 1 - -CONFIGURE_ARGS += --prefix=$(prefix) -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin -CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS += --enable-fastcgi -CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --with-mm=$(prefix) -CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --enable-spl=shared -CONFIGURE_ARGS += --with-pcre-regex -CONFIGURE_ARGS += --with-pear=shared - -# Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 -#ENABLE_CHECK = 0 - -include files/scripts.mk -include gar/category.mk Deleted: csw/mgar/pkg/php5/trunk/Makefile.php5dir =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.php5dir 2011-05-02 19:56:08 UTC (rev 14493) +++ csw/mgar/pkg/php5/trunk/Makefile.php5dir 2011-05-03 00:02:28 UTC (rev 14494) @@ -1,87 +0,0 @@ -NAME = php5 -VERSION = 5.2.9 -CATEGORIES = lang -SF_PROJ = $(shell echo $(NAME) | sed -e 's/[0-9]//g') -DISTNAME = $(SF_PROJ)-$(VERSION) - -DESCRIPTION = A high-level scripting language. -define BLURB - PHP is a widely-used Open Source general-purpose scripting language that is - especially suited for Web development and can be embedded into HTML. Its - syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many - different platforms and can be used as a standalone executable or as a - module under a variety of Web servers. It has excellent support for - databases, XML, LDAP, IMAP, Java, various Internet protocols, and general - data manipulation, and is extensible via its powerful API. It is actively - developed and supported by a talented and energetic international team. - Numerous Open Source and commercial PHP-based application packages are - available. -endef - -MASTER_SITES = http://us.php.net/distributions/ -SPKG_SOURCEURL = http://www.php.net/ -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ - -DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall - -PACKAGES = CSWphp5 CSWphp5devel - -CATALOGNAME_CSWphp5 = php5 -SPKG_DESC_CSWphp5 = A High-Level Scripting Languages -CATALOGNAME_CSWphp5devel = php5_devel -SPKG_DESC_CSWphp5devel = Development files for php5 -RUNTIME_DEP_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt -RUNTIME_DEP_PKGS_CSWphp5devel = CSWphp5 - -PKGFILES_CSWphp5devel = $(bindir)/php-config -PKGFILES_CSWphp5devel += $(bindir)/phpize -PKGFILES_CSWphp5devel += $(bindir)/peardev -PKGFILES_CSWphp5devel += $(libdir)/php/build/.* -PKGFILES_CSWphp5devel += $(includedir)/php/TSRM.* -PKGFILES_CSWphp5devel += $(includedir)/php/Zend.* -PKGFILES_CSWphp5devel += $(includedir)/php/include.* -PKGFILES_CSWphp5devel += $(includedir)/php/main.* -PKGFILES_CSWphp5devel += $(includedir)/php/regex.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/date.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/filter.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/libxml.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/pcre.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/spl.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/standard.* -PKGFILES_CSWphp5devel += $(includedir)/php/ext/xml.* -PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1 -PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1 - -PATCHFILES += configure.diff -PATCHFILES += php-bug-45557-fix.diff - -# PHP Extensions -EXTDIRLIST = $(shell ls -d extensions/*) -include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) - -EXTRA_CFLAGS = -I$(prefix)/include/ncursesw - -NOISALIST = 1 -STRIP_LIBTOOL = 1 - -CONFIGURE_ARGS += --prefix=$(prefix)/php5 -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin -CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS += --enable-fastcgi -CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --with-mm=$(prefix) -CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --enable-spl=shared -CONFIGURE_ARGS += --with-pcre-regex -CONFIGURE_ARGS += --with-pear=shared - -# Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 -ENABLE_CHECK = 0 - -include files/scripts.mk -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 3 05:01:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 03 May 2011 03:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14495] csw/mgar/pkg/git/trunk Message-ID: Revision: 14495 http://gar.svn.sourceforge.net/gar/?rev=14495&view=rev Author: bdwalton Date: 2011-05-03 03:01:03 +0000 (Tue, 03 May 2011) Log Message: ----------- git/trunk: patch around some utf8 testing in git-svn test suite Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-05-03 00:02:28 UTC (rev 14494) +++ csw/mgar/pkg/git/trunk/Makefile 2011-05-03 03:01:03 UTC (rev 14495) @@ -99,6 +99,9 @@ PATCHFILES += 0003-Update-path-in-sample-hook-file.patch PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch +# this patch is required on current9s (not necessarily all sparc boxes) due +# to the selection of available utf8 locales. +PATCHFILES_isa-sparcv8 += 0006-Force-en_US.UTF-8-for-a-git-svn-test.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch 2011-05-03 03:01:03 UTC (rev 14495) @@ -0,0 +1,32 @@ +From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 3 May 2011 04:50:15 +0200 +Subject: [PATCH] Force en_US.UTF-8 for a git-svn test + +This test fails when the UTF8 detection picks fr.UTF-8. Force it's hand +in this matter. This patch should only be applied on current9s for now. + +Signed-off-by: Ben Walton +--- + t/t9129-git-svn-i18n-commitencoding.sh | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh +index 8cfdfe7..dd570b6 100755 +--- a/t/t9129-git-svn-i18n-commitencoding.sh ++++ b/t/t9129-git-svn-i18n-commitencoding.sh +@@ -14,10 +14,7 @@ compare_git_head_with () { + test_cmp current "$1" + } + +-a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{ +- p +- q +-}') ++a_utf8_locale=en_US.UTF-8 + + if test -n "$a_utf8_locale" + then +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 3 07:37:16 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 03 May 2011 05:37:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14496] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 14496 http://gar.svn.sourceforge.net/gar/?rev=14496&view=rev Author: rthurner Date: 2011-05-03 05:37:16 +0000 (Tue, 03 May 2011) Log Message: ----------- mercurial: upgrade to hg-1.8.3 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-03 03:01:03 UTC (rev 14495) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-03 05:37:16 UTC (rev 14496) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.8.2 +VERSION = 1.8.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-05-03 03:01:03 UTC (rev 14495) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-05-03 05:37:16 UTC (rev 14496) @@ -1 +1 @@ -a1634b9b709ecc70662f3257abece2c7 mercurial-1.8.2.tar.gz +7afea936dfdb21220064cac6402f8743 mercurial-1.8.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 3 08:04:21 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 03 May 2011 06:04:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14497] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 14497 http://gar.svn.sourceforge.net/gar/?rev=14497&view=rev Author: rthurner Date: 2011-05-03 06:04:20 +0000 (Tue, 03 May 2011) Log Message: ----------- mercurial, PACKAGES = CSWmercurial should avoid to override pkg checks Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-03 05:37:16 UTC (rev 14496) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-03 06:04:20 UTC (rev 14497) @@ -3,27 +3,23 @@ CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system -#define BLURB -#endef MASTER_SITES = http://selenic.com/mercurial/release/ DISTFILES = $(NAME)-$(VERSION).tar.gz - -SPKG_DESC_CSWmercurial = Mercurial - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWmercurial + +SPKG_DESC_CSWmercurial = Mercurial +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. TEST_SCRIPTS = #TEST_TARGET = #tests -RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 -CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ - include gar/category.mk pre-build-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 3 09:03:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 May 2011 07:03:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14498] csw/mgar/pkg/lang-python Message-ID: Revision: 14498 http://gar.svn.sourceforge.net/gar/?rev=14498&view=rev Author: wahwah Date: 2011-05-03 07:03:17 +0000 (Tue, 03 May 2011) Log Message: ----------- lang-python/textile: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/textile/trunk/Makefile csw/mgar/pkg/lang-python/textile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/textile/ Modified: csw/mgar/pkg/lang-python/textile/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-04-04 17:31:21 UTC (rev 14073) +++ csw/mgar/pkg/lang-python/textile/trunk/Makefile 2011-05-03 07:03:17 UTC (rev 14498) @@ -2,186 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -NAME = mypkg -VERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +NAME = textile +VERSION = 2.1.4 +CATEGORIES = python +DESCRIPTION = XHTML generator using simple markup define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software -## release -## UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +EXTRA_MERGE_EXCLUDE_FILES = .*/test\.py CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +TEST_SCRIPTS = +ARCHALL_CSWpy-textile = 1 +include gar/category.mk Modified: csw/mgar/pkg/lang-python/textile/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-04-04 17:31:21 UTC (rev 14073) +++ csw/mgar/pkg/lang-python/textile/trunk/checksums 2011-05-03 07:03:17 UTC (rev 14498) @@ -0,0 +1 @@ +05ebee989379d5930e779f85d276abed textile-2.1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue May 3 15:00:39 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 03 May 2011 13:00:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14499] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 14499 http://gar.svn.sourceforge.net/gar/?rev=14499&view=rev Author: aigoshin Date: 2011-05-03 13:00:38 +0000 (Tue, 03 May 2011) Log Message: ----------- nginx: release 20110503 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/nginx/trunk/files/patch.errno Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-03 07:03:17 UTC (rev 14498) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-03 13:00:38 UTC (rev 14499) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.0.0 +VERSION = 1.0.1 CATEGORIES = server GARCOMPILER = SOS11 @@ -16,8 +16,6 @@ LICENSE = LICENSE -PATCHFILES = patch.errno - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-05-03 07:03:17 UTC (rev 14498) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-05-03 13:00:38 UTC (rev 14499) @@ -1 +1 @@ -5751c920c266ea5bb5fc38af77e9c71c nginx-1.0.0.tar.gz +4d4e70e3c6c907cb101c97e9cf9399c8 nginx-1.0.1.tar.gz Deleted: csw/mgar/pkg/nginx/trunk/files/patch.errno =================================================================== --- csw/mgar/pkg/nginx/trunk/files/patch.errno 2011-05-03 07:03:17 UTC (rev 14498) +++ csw/mgar/pkg/nginx/trunk/files/patch.errno 2011-05-03 13:00:38 UTC (rev 14499) @@ -1,26 +0,0 @@ -Index: nginx-1.0.0/auto/unix -=================================================================== ---- nginx-1.0.0/auto/unix (revision 3896) -+++ nginx-1.0.0/auto/unix (working copy) -@@ -141,14 +141,19 @@ - ngx_feature_name=NGX_SYS_NERR - ngx_feature_run=value - ngx_feature_incs='#include -+ #include ' - #include ' - ngx_feature_path= - ngx_feature_libs= - ngx_feature_test='int n; -+ char *p; - for (n = 1; n < 1000; n++) { - errno = 0; -- strerror(n); -- if (errno == EINVAL) { -+ p = strerror(n); -+ if (p == NULL -+ || strncmp(p, "Unknown error", 13) == 0 -+ || errno == EINVAL) -+ { - printf("%d", n); - return 0; - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 3 18:11:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 03 May 2011 16:11:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14500] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14500 http://gar.svn.sourceforge.net/gar/?rev=14500&view=rev Author: bdwalton Date: 2011-05-03 16:11:58 +0000 (Tue, 03 May 2011) Log Message: ----------- gdal/trunk: fix postgres configure arg Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-05-03 13:00:38 UTC (rev 14499) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-05-03 16:11:58 UTC (rev 14500) @@ -8,8 +8,6 @@ GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for data translation and processing. endef -GARTYPE = v2 - MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-the-use-of-CSWbash.patch @@ -23,8 +21,7 @@ CONFIGURE_ARGS += --with-jpeg=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5/bin/mysql_config -# not working yet. -#CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config +CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/sparcv8/pg_config CONFIGURE_ARGS += --with-sqlite3=$(prefix) # doesn't have tests? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 13:22:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 11:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14501] csw/mgar/pkg/rbgems Message-ID: Revision: 14501 http://gar.svn.sourceforge.net/gar/?rev=14501&view=rev Author: dmichelsen Date: 2011-05-04 11:22:48 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/activesupport-3.0.7: Initial commit from activesupport Modified Paths: -------------- csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/Makefile csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/activesupport-3.0.7/ Modified: csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/activesupport/trunk/Makefile 2011-05-03 16:11:58 UTC (rev 14500) +++ csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/Makefile 2011-05-04 11:22:48 UTC (rev 14501) @@ -1,13 +1,15 @@ NAME = activesupport -VERSION = 2.3.8 +VERSION = 3.0.7 CATEGORIES = rbgems DESCRIPTION = Utility library with commonly used stuff from the Rails framework define BLURB endef -LICENSE = README +LICENSE = README.rdoc +GEM_INSTALL_NO_TEST = + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/activesupport/trunk/checksums 2011-05-03 16:11:58 UTC (rev 14500) +++ csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/checksums 2011-05-04 11:22:48 UTC (rev 14501) @@ -1 +1 @@ -1211d35bb0489764fd1fcac19d081a47 activesupport-2.3.8.gem +1dffb96c1aacb5f6d4e377fd7e7da5a2 activesupport-3.0.7.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 13:23:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 11:23:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14502] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14502 http://gar.svn.sourceforge.net/gar/?rev=14502&view=rev Author: dmichelsen Date: 2011-05-04 11:23:49 +0000 (Wed, 04 May 2011) Log Message: ----------- mGAR v2: Make package names for ruby gems version specific Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-05-04 11:22:48 UTC (rev 14501) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-05-04 11:23:49 UTC (rev 14502) @@ -9,7 +9,8 @@ GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem DISTFILES += $(GEMFILE) -GEMPKGNAME ?= $(GEMNAME)-$(subst .,-,$(GEMVERSION)) +GEMPKGVERSION ?= $(subst .,-,$(GEMVERSION)) +GEMPKGNAME ?= $(GEMNAME)-$(GEMPKGVERSION) GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc @@ -76,11 +77,13 @@ @$(GARBIN)/check_for_deps $(GEM_DEPS) @$(MAKECOOKIE) +GEM_INSTALL_NO_TEST ?= --no-test + install-rbgem: gem install \ --ignore-dependencies \ --local \ - --no-test \ + $(GEM_INSTALL_NO_TEST) \ --install-dir $(DESTDIR)$(GEMDIR) \ $(EXTRA_GEM_INSTALL_ARGS) \ $(DOWNLOADDIR)/$(GEMFILE) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 13:29:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 11:29:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14503] csw/mgar/pkg/cpan/GDGraph3d/ Message-ID: Revision: 14503 http://gar.svn.sourceforge.net/gar/?rev=14503&view=rev Author: dmichelsen Date: 2011-05-04 11:29:28 +0000 (Wed, 04 May 2011) Log Message: ----------- cpan/GDGraph3d: Remove as sanitized package is built from cpan/GD-Graph3d Removed Paths: ------------- csw/mgar/pkg/cpan/GDGraph3d/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 13:41:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 11:41:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14504] csw/mgar/pkg/rbgems Message-ID: Revision: 14504 http://gar.svn.sourceforge.net/gar/?rev=14504&view=rev Author: dmichelsen Date: 2011-05-04 11:41:30 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/i18n-0.5.0: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/i18n-0.5.0/ csw/mgar/pkg/rbgems/i18n-0.5.0/Makefile csw/mgar/pkg/rbgems/i18n-0.5.0/branches/ csw/mgar/pkg/rbgems/i18n-0.5.0/tags/ csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/ csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/checksums csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/files/ Added: csw/mgar/pkg/rbgems/i18n-0.5.0/Makefile =================================================================== --- csw/mgar/pkg/rbgems/i18n-0.5.0/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/i18n-0.5.0/Makefile 2011-05-04 11:41:30 UTC (rev 14504) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/i18n-0.5.0/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile 2011-05-04 11:41:30 UTC (rev 14504) @@ -0,0 +1,20 @@ +NAME = i18n +VERSION = 0.5.0 +CATEGORIES = rbgems + +DESCRIPTION = New wave Internationalization support for Ruby + +define BLURB + New wave Internationalization suport for Ruby. +endef + +# RUNTIME_DEP_PKGS += CSWgem-activesupport +# RUNTIME_DEP_PKGS += CSWgem-sqlite3-ruby +# RUNTIME_DEP_PKGS += CSWgem-mocha +# RUNTIME_DEP_PKGS += CSWgem-test_declarative + +GEM_INSTALL_NO_TEST = + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/checksums 2011-05-04 11:41:30 UTC (rev 14504) @@ -0,0 +1 @@ +761d743478dfbdc4f2c1743d5241c009 i18n-0.5.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 13:49:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 11:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14505] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 14505 http://gar.svn.sourceforge.net/gar/?rev=14505&view=rev Author: dmichelsen Date: 2011-05-04 11:49:58 +0000 (Wed, 04 May 2011) Log Message: ----------- mGAR v2: Remove outdated option --no-test in rbgem category Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-05-04 11:41:30 UTC (rev 14504) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-05-04 11:49:58 UTC (rev 14505) @@ -77,13 +77,10 @@ @$(GARBIN)/check_for_deps $(GEM_DEPS) @$(MAKECOOKIE) -GEM_INSTALL_NO_TEST ?= --no-test - install-rbgem: gem install \ --ignore-dependencies \ --local \ - $(GEM_INSTALL_NO_TEST) \ --install-dir $(DESTDIR)$(GEMDIR) \ $(EXTRA_GEM_INSTALL_ARGS) \ $(DOWNLOADDIR)/$(GEMFILE) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 14:02:58 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 12:02:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14506] csw/mgar/pkg/rbgems Message-ID: Revision: 14506 http://gar.svn.sourceforge.net/gar/?rev=14506&view=rev Author: dmichelsen Date: 2011-05-04 12:02:58 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/builder-3.0.0: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/builder-3.0.0/ csw/mgar/pkg/rbgems/builder-3.0.0/Makefile csw/mgar/pkg/rbgems/builder-3.0.0/branches/ csw/mgar/pkg/rbgems/builder-3.0.0/tags/ csw/mgar/pkg/rbgems/builder-3.0.0/trunk/ csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile csw/mgar/pkg/rbgems/builder-3.0.0/trunk/checksums csw/mgar/pkg/rbgems/builder-3.0.0/trunk/files/ Added: csw/mgar/pkg/rbgems/builder-3.0.0/Makefile =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/builder-3.0.0/Makefile 2011-05-04 12:02:58 UTC (rev 14506) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/builder-3.0.0/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile 2011-05-04 12:02:58 UTC (rev 14506) @@ -0,0 +1,13 @@ +NAME = builder +VERSION = 3.0.0 +CATEGORIES = rbgems + +DESCRIPTION = Builder provides a number of builder objects that make creating structured data simple to do + +define BLURB + Builder provides a number of builder objects that make creatingstructured data simple to do. Curently the folowing builder objectsare suported: * XML Markup * XML Events +endef + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/builder-3.0.0/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/builder-3.0.0/trunk/checksums 2011-05-04 12:02:58 UTC (rev 14506) @@ -0,0 +1 @@ +cf9d2693d684a749e35dda886c4dc23c builder-3.0.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 14:21:05 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 12:21:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14507] csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile Message-ID: Revision: 14507 http://gar.svn.sourceforge.net/gar/?rev=14507&view=rev Author: dmichelsen Date: 2011-05-04 12:21:05 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/builder-3.0.0: Add license, disable docs as they seem to be broken Modified Paths: -------------- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile Modified: csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile 2011-05-04 12:02:58 UTC (rev 14506) +++ csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile 2011-05-04 12:21:05 UTC (rev 14507) @@ -8,6 +8,15 @@ Builder provides a number of builder objects that make creatingstructured data simple to do. Curently the folowing builder objectsare suported: * XML Markup * XML Events endef +LICENSE = README + ARCHALL = 1 +# Documentation is broken for this GEM +EXTRA_GEM_INSTALL_ARGS += --no-rdoc +EXTRA_GEM_INSTALL_ARGS += --no-ri + +# I think that is an example for mysql: +CHECKPKG_OVERRIDES_CSWrb18-builder-3-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/builder-3.0.0/TAGS + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 14:30:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 12:30:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14508] csw/mgar/pkg/rbgems Message-ID: Revision: 14508 http://gar.svn.sourceforge.net/gar/?rev=14508&view=rev Author: dmichelsen Date: 2011-05-04 12:30:05 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/activemodel-3.0.7: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/Makefile csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/activemodel-3.0.7/ Modified: csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/Makefile 2011-05-04 11:22:48 UTC (rev 14501) +++ csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/Makefile 2011-05-04 12:30:05 UTC (rev 14508) @@ -1,15 +1,21 @@ -NAME = activesupport +NAME = activemodel VERSION = 3.0.7 CATEGORIES = rbgems -DESCRIPTION = Utility library with commonly used stuff from the Rails framework +DESCRIPTION = A toolkit for building modeling frameworks like Active Record and Active Resource define BLURB endef LICENSE = README.rdoc -GEM_INSTALL_NO_TEST = - ARCHALL = 1 +# This would check the prerequisites. However, these have now the version in the name. +# No good idea on how to solve this ATM apart from manually writing them down. +CONFIGURE_SCRIPTS = + +DEP_PKGS += CSWrb18-activesupport-3-0-7 +DEP_PKGS += CSWrb18-builder-3-0-0 +DEP_PKGS += CSWrb18-i18n-0-5-0 + include gar/category.mk Modified: csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/checksums 2011-05-04 11:22:48 UTC (rev 14501) +++ csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/checksums 2011-05-04 12:30:05 UTC (rev 14508) @@ -1 +1 @@ -1dffb96c1aacb5f6d4e377fd7e7da5a2 activesupport-3.0.7.gem +e17391796dde0a1e1fcb95ce35be4041 activemodel-3.0.7.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 14:46:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 12:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14509] csw/mgar/pkg/libgpg_error/trunk/Makefile Message-ID: Revision: 14509 http://gar.svn.sourceforge.net/gar/?rev=14509&view=rev Author: dmichelsen Date: 2011-05-04 12:46:03 +0000 (Wed, 04 May 2011) Log Message: ----------- libgpg_error: Refine packaging according latest rules and defaults Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2011-05-04 12:30:05 UTC (rev 14508) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2011-05-04 12:46:03 UTC (rev 14509) @@ -11,46 +11,32 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgpg-error/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES += CSWgpgerr -CATALOGNAME_CSWgpgerr = gpgerr -SPKG_DESC_CSWgpgerr = Transitional package as contents moved to CSWlibgpg-error and CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWgpgerr = CSWgpg-error CSWlibgpg-error0 -CHECKPKG_OVERRIDES_CSWgpgerr += surplus-dependency|CSWgpg-error -CHECKPKG_OVERRIDES_CSWgpgerr += surplus-dependency|CSWlibgpg-error0 -PKGFILES_CSWgpgerr = NOFILES -ARCHALL_CSWgpgerr = 1 - PACKAGES += CSWgpg-error CATALOGNAME_CSWgpg-error = gpg_error SPKG_DESC_CSWgpg-error = Tools for libgpg-error.so RUNTIME_DEP_PKGS_CSWgpg-error = CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWgpg-error += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgpg-error += CSWlibintl8 +OBSOLETED_BY_CSWgpg-error = CSWgpgerr PACKAGES += CSWlibgpg-error0 CATALOGNAME_CSWlibgpg-error0 = libgpg_error0 -SPKG_DESC_CSWlibgpg-error0 = GNU gpg related library providing libgpg-error.so.0 -PKGFILES_CSWlibgpg-error0 = $(call baseisadirs,$(libdir),libgpg-error\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgpg-error0 = GNU gpg related library, libgpg-error.so.0 +PKGFILES_CSWlibgpg-error0 += $(call pkgfiles_lib,libgpg-error.so.0) +PKGFILES_CSWlibgpg-error0 += .*/libgpg-error.mo +RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibintl8 +OBSOLETED_BY_libgpg-error0 = CSWgpgerr PACKAGES += CSWlibgpg-error-dev CATALOGNAME_CSWlibgpg-error-dev = libgpg_error_dev -SPKG_DESC_CSWlibgpg-error-dev = Development files for libgpg-error.so +SPKG_DESC_CSWlibgpg-error-dev = Development files for libgpg-error.so.0 PKGFILES_CSWlibgpg-error-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibgpg-error-dev += $(sharedstatedir)/common-lisp/.* RUNTIME_DEP_PKGS_CSWlibgpg-error-dev += CSWlibgpg-error0 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - VENDOR_URL = http://www.gnupg.org/download/ RUNTIME_DEP_PKGS = CSWggettextrt BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -MERGE_DIRS_isa-extra = $(libdir) - -TEST_TARGET = check - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 14:54:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 12:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14510] csw/mgar/pkg/rbgems Message-ID: Revision: 14510 http://gar.svn.sourceforge.net/gar/?rev=14510&view=rev Author: dmichelsen Date: 2011-05-04 12:54:28 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/activerecord-3.0.7: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/Makefile csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/activerecord-3.0.7/ Modified: csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/activerecord/trunk/Makefile 2011-05-03 16:11:58 UTC (rev 14500) +++ csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/Makefile 2011-05-04 12:54:28 UTC (rev 14510) @@ -1,5 +1,5 @@ NAME = activerecord -VERSION = 2.3.8 +VERSION = 3.0.7 CATEGORIES = rbgems DESCRIPTION = Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM @@ -9,12 +9,11 @@ DISTFILES = COPYING -PACKAGES = CSWgem-activerecord -CATALOGNAME = gem_activerecord - LICENSE = COPYING -DEP_PKGS = CSWgem-activesupport +# We control the deps ourselves for now +CONFIGURE_SCRIPTS = +DEP_PKGS += CSWrb18-activesupport-3-0-7 ARCHALL = 1 Modified: csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/activerecord/trunk/checksums 2011-05-03 16:11:58 UTC (rev 14500) +++ csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/checksums 2011-05-04 12:54:28 UTC (rev 14510) @@ -1,2 +1 @@ -ce0328fedbb7b8887ee7800a9d3cbe9e COPYING -16311c40a988bd9f8ffeb44799d9f488 activerecord-2.3.8.gem +21f21c60cc414b481c76bb608356bc7c activerecord-3.0.7.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 15:58:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 13:58:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14511] csw/mgar/pkg/libflac4/trunk/Makefile Message-ID: Revision: 14511 http://gar.svn.sourceforge.net/gar/?rev=14511&view=rev Author: dmichelsen Date: 2011-05-04 13:58:57 +0000 (Wed, 04 May 2011) Log Message: ----------- libflac4: Minor fixes to new defaults Modified Paths: -------------- csw/mgar/pkg/libflac4/trunk/Makefile Modified: csw/mgar/pkg/libflac4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac4/trunk/Makefile 2011-05-04 12:54:28 UTC (rev 14510) +++ csw/mgar/pkg/libflac4/trunk/Makefile 2011-05-04 13:58:57 UTC (rev 14511) @@ -24,7 +24,7 @@ PACKAGES += CSWlibflac4 CATALOGNAME_CSWlibflac4 = libflac4 SPKG_DESC_CSWlibflac4 = Free lossless audio codec library, libflac.so.4 -PKGFILES_CSWlibflac4 = $(call baseisadirs,$(libdir),libFLAC\.so\.4(\.\d+)*) +PKGFILES_CSWlibflac4 = $(call pkgfiles_lib,libFLAC.so.4) RUNTIME_DEP_PKGS_CSWlibflac4 += CSWiconv # Override conflicts with CSWflac as the new CSWflac is built from the latest libflac @@ -47,8 +47,6 @@ # This is a legacy library, built XMMS plugin against newest one CONFIGURE_ARGS += --with-xmms-prefix=/notthere -TEST_TARGET = check - # There is one test failing, but as this is really a long-outdated legacy library # I don't care much for now. SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 16:05:43 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 14:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14512] csw/mgar/pkg/libogg/trunk/Makefile Message-ID: Revision: 14512 http://gar.svn.sourceforge.net/gar/?rev=14512&view=rev Author: dmichelsen Date: 2011-05-04 14:05:42 +0000 (Wed, 04 May 2011) Log Message: ----------- libogg: Update due to new defaults Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2011-05-04 13:58:57 UTC (rev 14511) +++ csw/mgar/pkg/libogg/trunk/Makefile 2011-05-04 14:05:42 UTC (rev 14512) @@ -9,28 +9,21 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/ogg/ -DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES = $(DISTNAME).tar.xz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES += CSWlibogg0 CATALOGNAME_CSWlibogg0 = libogg0 -SPKG_DESC_CSWlibogg0 = Ogg bitstream format support library providing libogg.so.0 -PKGFILES_CSWlibogg0 = $(call baseisadirs,$(libdir),libogg\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibogg0 = Ogg bitstream format support library, libogg.so.0 +PKGFILES_CSWlibogg0 = $(call pkgfiles_lib,libogg.so.0) OBSOLETED_BY_CSWlibogg0 = CSWlibogg PACKAGES += CSWlibogg-dev CATALOGNAME_CSWlibogg-dev = libogg_dev -SPKG_DESC_CSWlibogg-dev = Development files for libogg.so +SPKG_DESC_CSWlibogg-dev = Development files for libogg.so.0 RUNTIME_DEP_PKGS_CSWlibogg-dev = CSWlibogg0 VENDOR_URL = http://www.vorbis.com/ BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 16:29:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 14:29:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14513] csw/mgar/pkg/libflac8/trunk/Makefile Message-ID: Revision: 14513 http://gar.svn.sourceforge.net/gar/?rev=14513&view=rev Author: dmichelsen Date: 2011-05-04 14:29:48 +0000 (Wed, 04 May 2011) Log Message: ----------- libflac8: Move binaries to CSWflac and general cleanup Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-05-04 14:05:42 UTC (rev 14512) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-05-04 14:29:48 UTC (rev 14513) @@ -47,14 +47,13 @@ RUNTIME_DEP_PKGS_CSWlibflac-dev = CSWlibflac8 RUNTIME_DEP_PKGS_CSWlibflac-dev += CSWlibflac++6 -PACKAGES += CSWlibflac-utils -CATALOGNAME_CSWlibflac-utils = libflac_utils -SPKG_DESC_CSWlibflac-utils = Utility programs for the Free Lossless Audio Codec (FLAC) +PACKAGES += CSWflac +CATALOGNAME_CSWflac = flac +SPKG_DESC_CSWflac = Utility programs for the Free Lossless Audio Codec (FLAC) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWiconv -RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibflac8 -OBSOLETED_BY_CSWlibflac-utils = CSWflac +RUNTIME_DEP_PKGS_CSWflac += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWflac += CSWiconv +RUNTIME_DEP_PKGS_CSWflac += CSWlibflac8 PACKAGES += CSWxmms-flac PKGFILES_CSWxmms-flac = $(libdir)/xmms/.* @@ -71,15 +70,11 @@ LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) -# EXTRA_LINKER_FLAGS = -liconv -lm EXTRA_LINKER_FLAGS = -norunpath -# EXTRA_CXXFLAGS = -norunpath # Must be defined and empty or -I$(includedir) is added too early -# EXTRA_INC = ../../include CPPFLAGS = EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline= -# EXTRA_CFLAGS = -D__inline= STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 4 17:49:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 May 2011 15:49:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14514] csw/mgar/pkg/rbgems Message-ID: Revision: 14514 http://gar.svn.sourceforge.net/gar/?rev=14514&view=rev Author: dmichelsen Date: 2011-05-04 15:49:47 +0000 (Wed, 04 May 2011) Log Message: ----------- rbgems/rubyrep-1.2.0: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/rubyrep-1.2.0/ csw/mgar/pkg/rbgems/rubyrep-1.2.0/Makefile csw/mgar/pkg/rbgems/rubyrep-1.2.0/branches/ csw/mgar/pkg/rbgems/rubyrep-1.2.0/tags/ csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/ csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/Makefile csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/checksums csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/files/ Added: csw/mgar/pkg/rbgems/rubyrep-1.2.0/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rubyrep-1.2.0/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rubyrep-1.2.0/Makefile 2011-05-04 15:49:47 UTC (rev 14514) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/Makefile 2011-05-04 15:49:47 UTC (rev 14514) @@ -0,0 +1,19 @@ +NAME = rubyrep +VERSION = 1.2.0 +CATEGORIES = rbgems + +DESCRIPTION = SQL replication + +define BLURB +endef + +LICENSE = License.txt + +# We handle deps manually +CONFIGURE_SCRIPTS = +RUNTIME_DEP_PKGS += CSWrb18-activesupport-3-0-7 +RUNTIME_DEP_PKGS += CSWrb18-activerecord-3-0-7 + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/checksums 2011-05-04 15:49:47 UTC (rev 14514) @@ -0,0 +1 @@ +0fe4a6d8bfc84be8d67710a273c618d8 rubyrep-1.2.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed May 4 18:36:51 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 04 May 2011 12:36:51 -0400 Subject: [csw-devel] proposed modification of i.cswusergroup In-Reply-To: <1304126960-sup-8609@pinkfloyd.chass.utoronto.ca> References: <1304126960-sup-8609@pinkfloyd.chass.utoronto.ca> Message-ID: <1304526967-sup-9204@pinkfloyd.chass.utoronto.ca> Excerpts from Ben Walton's message of Fri Apr 29 21:32:17 -0400 2011: > I've tested it (lightly) and it seems to work. Does anyone else want > to give it a whirl and provide feedback before I commit it? FYI, I committed this change. I'll release the updated package in the near future. At that time, I'll update the docs to match. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From wahwah at users.sourceforge.net Thu May 5 10:27:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 May 2011 08:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14515] csw/mgar/pkg/lang-python Message-ID: Revision: 14515 http://gar.svn.sourceforge.net/gar/?rev=14515&view=rev Author: wahwah Date: 2011-05-05 08:27:44 +0000 (Thu, 05 May 2011) Log Message: ----------- xlwt: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/xlwt/trunk/Makefile csw/mgar/pkg/lang-python/xlwt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/xlwt/ Modified: csw/mgar/pkg/lang-python/xlwt/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-05-04 15:49:47 UTC (rev 14514) +++ csw/mgar/pkg/lang-python/xlwt/trunk/Makefile 2011-05-05 08:27:44 UTC (rev 14515) @@ -2,186 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -NAME = mypkg -VERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +NAME = xlwt +VERSION = 0.7.2 +CATEGORIES = python +DESCRIPTION = Library to create MS Excel 97/2000/XP/2003 compatible XLS files define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR), -## $(PYPI_MIRROR) -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software -## release -## UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +ARCHALL_CSWpy-xlwt = 1 +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/lang-python/xlwt/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-05-04 15:49:47 UTC (rev 14514) +++ csw/mgar/pkg/lang-python/xlwt/trunk/checksums 2011-05-05 08:27:44 UTC (rev 14515) @@ -0,0 +1 @@ +ed4b529b883a60b1b887fa30f31823f3 xlwt-0.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 5 10:34:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 May 2011 08:34:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14516] csw/mgar/pkg/lang-python Message-ID: Revision: 14516 http://gar.svn.sourceforge.net/gar/?rev=14516&view=rev Author: wahwah Date: 2011-05-05 08:34:39 +0000 (Thu, 05 May 2011) Log Message: ----------- pkg/lang-python/shapely: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/shapely/trunk/Makefile csw/mgar/pkg/lang-python/shapely/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/shapely/ Modified: csw/mgar/pkg/lang-python/shapely/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/xlwt/trunk/Makefile 2011-05-05 08:27:44 UTC (rev 14515) +++ csw/mgar/pkg/lang-python/shapely/trunk/Makefile 2011-05-05 08:34:39 UTC (rev 14516) @@ -2,13 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = xlwt -VERSION = 0.7.2 +NAME = Shapely +VERSION = 1.2.9 CATEGORIES = python -DESCRIPTION = Library to create MS Excel 97/2000/XP/2003 compatible XLS files +DESCRIPTION = Geometric objects, predicates, and operations define BLURB endef DISTFILES = $(NAME)-$(VERSION).tar.gz -ARCHALL_CSWpy-xlwt = 1 +PACKAGES = CSWpy-shapely TEST_SCRIPTS = +ARCHALL_CSWpy-shapely = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/shapely/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/xlwt/trunk/checksums 2011-05-05 08:27:44 UTC (rev 14515) +++ csw/mgar/pkg/lang-python/shapely/trunk/checksums 2011-05-05 08:34:39 UTC (rev 14516) @@ -1 +1 @@ -ed4b529b883a60b1b887fa30f31823f3 xlwt-0.7.2.tar.gz +ffad79cdaf3609ac1f90b19a6b16bbea Shapely-1.2.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 5 10:40:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 May 2011 08:40:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14517] csw/mgar/pkg/lang-python Message-ID: Revision: 14517 http://gar.svn.sourceforge.net/gar/?rev=14517&view=rev Author: wahwah Date: 2011-05-05 08:40:19 +0000 (Thu, 05 May 2011) Log Message: ----------- pkg/lang-python/reportlab: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile csw/mgar/pkg/lang-python/reportlab/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/reportlab/ Modified: csw/mgar/pkg/lang-python/reportlab/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/xlwt/trunk/Makefile 2011-05-05 08:27:44 UTC (rev 14515) +++ csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 08:40:19 UTC (rev 14517) @@ -2,13 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = xlwt -VERSION = 0.7.2 +NAME = reportlab +VERSION = 2.5 CATEGORIES = python -DESCRIPTION = Library to create MS Excel 97/2000/XP/2003 compatible XLS files +DESCRIPTION = Programatically creating documents in PDF format define BLURB endef +MASTER_SITES = http://www.reportlab.com/ftp/ DISTFILES = $(NAME)-$(VERSION).tar.gz -ARCHALL_CSWpy-xlwt = 1 TEST_SCRIPTS = +ARCHALL_CSWpy-reportlab = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/reportlab/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/xlwt/trunk/checksums 2011-05-05 08:27:44 UTC (rev 14515) +++ csw/mgar/pkg/lang-python/reportlab/trunk/checksums 2011-05-05 08:40:19 UTC (rev 14517) @@ -1 +1 @@ -ed4b529b883a60b1b887fa30f31823f3 xlwt-0.7.2.tar.gz +cdf8b87a6cf1501de1b0a8d341a217d3 reportlab-2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 10:44:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 08:44:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14518] csw/mgar/pkg/xorriso/trunk Message-ID: Revision: 14518 http://gar.svn.sourceforge.net/gar/?rev=14518&view=rev Author: dmichelsen Date: 2011-05-05 08:44:31 +0000 (Thu, 05 May 2011) Log Message: ----------- xorriso: Update to 1.0.8 and update according to new defaults Modified Paths: -------------- csw/mgar/pkg/xorriso/trunk/Makefile csw/mgar/pkg/xorriso/trunk/checksums Modified: csw/mgar/pkg/xorriso/trunk/Makefile =================================================================== --- csw/mgar/pkg/xorriso/trunk/Makefile 2011-05-05 08:40:19 UTC (rev 14517) +++ csw/mgar/pkg/xorriso/trunk/Makefile 2011-05-05 08:44:31 UTC (rev 14518) @@ -1,6 +1,6 @@ # $Id$ NAME = xorriso -VERSION = 1.0.1 +VERSION = 1.0.8 CATEGORIES = utils DESCRIPTION = ISO 9660 Rock Ridge Filesystem Manipulator @@ -10,11 +10,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) - RUNTIME_DEP_PKGS_CSWxorriso += CSWiconv RUNTIME_DEP_PKGS_CSWxorriso += CSWreadline RUNTIME_DEP_PKGS_CSWxorriso += CSWbzip2 Modified: csw/mgar/pkg/xorriso/trunk/checksums =================================================================== --- csw/mgar/pkg/xorriso/trunk/checksums 2011-05-05 08:40:19 UTC (rev 14517) +++ csw/mgar/pkg/xorriso/trunk/checksums 2011-05-05 08:44:31 UTC (rev 14518) @@ -1 +1 @@ -ef83607f195a4769c53c11b443a51b3b xorriso-1.0.1.tar.gz +b15486f41c0a344fe6659ab88cac6363 xorriso-1.0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 5 10:52:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 May 2011 08:52:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14519] csw/mgar/pkg Message-ID: Revision: 14519 http://gar.svn.sourceforge.net/gar/?rev=14519&view=rev Author: wahwah Date: 2011-05-05 08:52:17 +0000 (Thu, 05 May 2011) Log Message: ----------- reportlab: Removing old location, updating dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/reportlab/ Modified: csw/mgar/pkg/lang-python/reportlab/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 08:44:31 UTC (rev 14518) +++ csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 08:52:17 UTC (rev 14519) @@ -7,9 +7,19 @@ CATEGORIES = python DESCRIPTION = Programatically creating documents in PDF format define BLURB + Free Open Source PDF library is suitable for web publishers, developers + or creative design professionals who need to quickly and easily create + or automate complex (even data-driven) documents. It lets you create + professional documents programmatically without being locked into one + special technology and/or platform. It has grown over years in response + to the real-world requirements of large financial institutions' + reporting needs, making it the trusted proven foundation of existing + enterprise solutions rather than a just a fancy gimmick or interesting + library. endef MASTER_SITES = http://www.reportlab.com/ftp/ DISTFILES = $(NAME)-$(VERSION).tar.gz +RUNTIME_DEP_PKGS_CSWreportlab = CSWpil TEST_SCRIPTS = ARCHALL_CSWpy-reportlab = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 11:14:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 09:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14520] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14520 http://gar.svn.sourceforge.net/gar/?rev=14520&view=rev Author: dmichelsen Date: 2011-05-05 09:14:55 +0000 (Thu, 05 May 2011) Log Message: ----------- mGAR v2: Do not verify SPKG_DESC of obsoleted pkgs Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-05-05 08:52:17 UTC (rev 14519) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-05-05 09:14:55 UTC (rev 14520) @@ -639,7 +639,7 @@ $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set.)))) $(foreach P,$(SPKG_SPECS),\ - $(foreach Q,$(filter-out $(P),$(SPKG_SPECS)),\ + $(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\ $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) .PRECIOUS: $(WORKDIR)/%.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 5 11:25:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 May 2011 09:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14521] csw/mgar/pkg/lang-python/reportlab/trunk Message-ID: Revision: 14521 http://gar.svn.sourceforge.net/gar/?rev=14521&view=rev Author: wahwah Date: 2011-05-05 09:25:01 +0000 (Thu, 05 May 2011) Log Message: ----------- pkg/lang-python/reportlab/trunk: Obsoleting packages, patching /usr/local Modified Paths: -------------- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/reportlab/trunk/files/0001-Default-location-of-hyphen.mashed.patch Modified: csw/mgar/pkg/lang-python/reportlab/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 09:14:55 UTC (rev 14520) +++ csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 09:25:01 UTC (rev 14521) @@ -5,7 +5,7 @@ NAME = reportlab VERSION = 2.5 CATEGORIES = python -DESCRIPTION = Programatically creating documents in PDF format +SPKG_DESC_CSWpy-reportlab = Programatically creating documents in PDF format define BLURB Free Open Source PDF library is suitable for web publishers, developers or creative design professionals who need to quickly and easily create @@ -19,7 +19,19 @@ endef MASTER_SITES = http://www.reportlab.com/ftp/ DISTFILES = $(NAME)-$(VERSION).tar.gz -RUNTIME_DEP_PKGS_CSWreportlab = CSWpil +PATCHFILES += 0001-Default-location-of-hyphen.mashed.patch +RUNTIME_DEP_PKGS_CSWpy-reportlab = CSWpil TEST_SCRIPTS = -ARCHALL_CSWpy-reportlab = 1 +OBSOLETED_BY_CSWpy-reportlab = CSWreportlab +OBSOLETED_BY_CSWpy-reportlab += CSWrenderpm +RUNTIME_DEP_PKGS_CSWpy-reportlab += CSWftype2 +RUNTIME_DEP_PKGS_CSWpy-reportlab += CSWlibpython2-6-1-0 +# Some checks in default locations; won't do any harm. +CHECKPKG_OVERRIDES_CSWpy-reportlab += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/reportlab/rl_config.py +CHECKPKG_OVERRIDES_CSWpy-reportlab += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/reportlab/rl_config.py +# checkpkg does not detect Python deps; also the Python category causes the +# transitional packages to depend on Python (which is okay). +CHECKPKG_OVERRIDES_CSWrenderpm += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWreportlab += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpy-reportlab += surplus-dependency|CSWpil include gar/category.mk Added: csw/mgar/pkg/lang-python/reportlab/trunk/files/0001-Default-location-of-hyphen.mashed.patch =================================================================== --- csw/mgar/pkg/lang-python/reportlab/trunk/files/0001-Default-location-of-hyphen.mashed.patch (rev 0) +++ csw/mgar/pkg/lang-python/reportlab/trunk/files/0001-Default-location-of-hyphen.mashed.patch 2011-05-05 09:25:01 UTC (rev 14521) @@ -0,0 +1,25 @@ +From fbf5e90e620e6ecbd8f75d7e79e8d0a7b3b6aac8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 5 May 2011 11:19:33 +0200 +Subject: [PATCH] Default location of hyphen.mashed + +--- + src/rl_addons/rl_accel/pyHnjmodule.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/rl_addons/rl_accel/pyHnjmodule.c b/src/rl_addons/rl_accel/pyHnjmodule.c +index d03d5cd..7fb68e7 100644 +--- a/src/rl_addons/rl_accel/pyHnjmodule.c ++++ b/src/rl_addons/rl_accel/pyHnjmodule.c +@@ -209,7 +209,7 @@ newHyphenobject(PyObject *module, PyObject *args) { + PyArg_ParseTuple(args, "|s", &filename); + + if(filename == NULL) +- filename = "/usr/local/share/pyHnj/hyphen.mashed"; /* default */ ++ filename = "/opt/csw/lib/python/site-packages/reportlab/lib/hyphen.mashed"; /* default */ + + self = PyObject_NEW(Hyphenobject, &Hyphentype); + if (self == NULL) +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 12:42:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 10:42:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14522] csw/mgar/pkg Message-ID: Revision: 14522 http://gar.svn.sourceforge.net/gar/?rev=14522&view=rev Author: dmichelsen Date: 2011-05-05 10:42:42 +0000 (Thu, 05 May 2011) Log Message: ----------- nettle: Initial commit Added Paths: ----------- csw/mgar/pkg/nettle/ csw/mgar/pkg/nettle/Makefile csw/mgar/pkg/nettle/branches/ csw/mgar/pkg/nettle/tags/ csw/mgar/pkg/nettle/trunk/ csw/mgar/pkg/nettle/trunk/Makefile csw/mgar/pkg/nettle/trunk/checksums csw/mgar/pkg/nettle/trunk/files/ csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch Copied: csw/mgar/pkg/nettle/Makefile (from rev 14514, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nettle/Makefile (rev 0) +++ csw/mgar/pkg/nettle/Makefile 2011-05-05 10:42:42 UTC (rev 14522) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/nettle/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nettle/trunk/Makefile =================================================================== --- csw/mgar/pkg/nettle/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nettle/trunk/Makefile 2011-05-05 10:42:42 UTC (rev 14522) @@ -0,0 +1,54 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = nettle +VERSION = 2.1 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = A low-level cryptographic library +define BLURB + Nettle is a cryptographic library that is designed to fit easily in more or less any context: + In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications + like LSH or GNUPG, or even in kernel space. +endef + +MASTER_SITES = http://www.lysator.liu.se/~nisse/archive/ +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Add-dynamic-linkage-information-for-Solaris.patch + +VENDOR_URL = http://www.lysator.liu.se/~nisse/nettle/ + +PACKAGES += CSWlibhogweed2 +PKGFILES_CSWlibhogweed2 += $(call pkgfiles_lib,libhogweed.so.2) +SPKG_DESC_CSWlibhogweed2 += A low-level cryptographic library, libhogweed.so.2 +RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibgmp +RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibnettle4 + +PACKAGES += CSWlibnettle4 +PKGFILES_CSWlibnettle4 += $(call pkgfiles_lib,libnettle.so.4) +SPKG_DESC_CSWlibnettle4 += A low-level cryptographic library, libnettle.so.4 + +PACKAGES += CSWlibnettle-dev +PKGFILES_CSWlibnettle-dev = $(PKGFILES_DEVEL) +SPKG_DESC_CSWlibnettle-dev = Development files for libnettle.so.4 and libhogweed.so.2 +RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibhogweed2 +RUNTIME_DEP_PKGS_CSWlibnettle-dev += CSWlibnettle4 + +PACKAGES += CSWlibnettle-utils +SPKG_DESC_CSWlibnettle-utils = Utility programs for libnettle +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed2 +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle4 +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp + +BUILD64 = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +# This is the default install location after configure +CHECKPKG_OVERRIDES_CSWlibnettle-utils += file-with-bad-content|/usr/local|root/opt/csw/share/info/nettle.info + +include gar/category.mk + Property changes on: csw/mgar/pkg/nettle/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/nettle/trunk/checksums =================================================================== --- csw/mgar/pkg/nettle/trunk/checksums (rev 0) +++ csw/mgar/pkg/nettle/trunk/checksums 2011-05-05 10:42:42 UTC (rev 14522) @@ -0,0 +1 @@ +2bfaf16234a5d8deb96cd23f53a682bb nettle-2.1.tar.gz Added: csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch =================================================================== --- csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch 2011-05-05 10:42:42 UTC (rev 14522) @@ -0,0 +1,61 @@ +From 834e429f07e890d943a517501f1d566ad2dbccd7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 5 May 2011 11:25:05 +0200 +Subject: [PATCH] Add dynamic linkage information for Solaris + +--- + configure | 13 +++++++++++++ + configure.ac | 13 +++++++++++++ + 2 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index f7d6767..0f0cbca 100755 +--- a/configure ++++ b/configure +@@ -4198,6 +4198,19 @@ case "$host_os" in + LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)' + LIBHOGWEED_LIBS='' + ;; ++ solaris*) ++ LIBNETTLE_FORLINK=libnettle.so ++ LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' ++ LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' ++ LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)' ++ LIBNETTLE_LIBS='' ++ ++ LIBHOGWEED_FORLINK=libhogweed.so ++ LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' ++ LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' ++ LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)' ++ LIBHOGWEED_LIBS='-lnettle -lgmp' ++ ;; + *) + LIBNETTLE_FORLINK=libnettle.so + LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' +diff --git a/configure.ac b/configure.ac +index 0251ffa..439cee8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -259,6 +259,19 @@ case "$host_os" in + LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)' + LIBHOGWEED_LIBS='' + ;; ++ solaris*) ++ LIBNETTLE_FORLINK=libnettle.so ++ LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' ++ LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' ++ LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)' ++ LIBNETTLE_LIBS='' ++ ++ LIBHOGWEED_FORLINK=libhogweed.so ++ LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' ++ LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' ++ LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)' ++ LIBHOGWEED_LIBS='-lnettle -lgmp' ++ ;; + *) + LIBNETTLE_FORLINK=libnettle.so + LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 12:42:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 10:42:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14523] csw/mgar/pkg/lang-python/reportlab/trunk/Makefile Message-ID: Revision: 14523 http://gar.svn.sourceforge.net/gar/?rev=14523&view=rev Author: dmichelsen Date: 2011-05-05 10:42:49 +0000 (Thu, 05 May 2011) Log Message: ----------- lang-python/reportlab: Fix issue on i386 Modified Paths: -------------- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile Modified: csw/mgar/pkg/lang-python/reportlab/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 10:42:42 UTC (rev 14522) +++ csw/mgar/pkg/lang-python/reportlab/trunk/Makefile 2011-05-05 10:42:49 UTC (rev 14523) @@ -35,3 +35,8 @@ CHECKPKG_OVERRIDES_CSWreportlab += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpy-reportlab += surplus-dependency|CSWpil include gar/category.mk + +post-extract-modulated: + @# The label 'ERR' confuses the compiler on i386 + perl -pi -e 's,ERR,ERRLABEL,g;' \ + $(WORKSRC)/src/rl_addons/renderPM/_renderPM.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 13:44:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 11:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14524] csw/mgar/pkg/libtasn1/trunk/Makefile Message-ID: Revision: 14524 http://gar.svn.sourceforge.net/gar/?rev=14524&view=rev Author: dmichelsen Date: 2011-05-05 11:44:02 +0000 (Thu, 05 May 2011) Log Message: ----------- libtasn1: Update to latest package name standards and defaults Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2011-05-05 10:42:49 UTC (rev 14523) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2011-05-05 11:44:02 UTC (rev 14524) @@ -10,43 +10,32 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWlibtasn1 CSWlibtasn1-3 CSWlibtasn1devel +VENDOR_URL = http://www.gnu.org/software/gnutls/ -CATALOGNAME_CSWlibtasn1 = libtasn1 -CATALOGNAME_CSWlibtasn1-3 = libtasn1_3 -CATALOGNAME_CSWlibtasn1devel = libtasn1_devel +PACKAGES += CSWlibtasn1-3 +SPKG_DESC_CSWlibtasn1-3 = GNU ASN 1 library, libtasn1.so.3 +PKGFILES_CSWlibtasn1-3 = $(call pkgfiles_lib,libtasn1.so.3) -SPKG_DESC_CSWlibtasn1 = $(DESCRIPTION) -SPKG_DESC_CSWlibtasn1-3 = GNU ASN 1 Library libtasn1.so.3 -SPKG_DESC_CSWlibtasn1devel = Development files for libtasn1 +PACKAGES += CSWlibtasn1-dev +SPKG_DESC_CSWlibtasn1-dev = Development files for libtasn1.so.3 +PKGFILES_CSWlibtasn1-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibtasn1-dev = CSWlibtasn1-3 +OBSOLETED_BY_CSWlibtasn1-dev += CSWlibtasn1devel +CATALOGNAME_CSWlibtasn1devel = libtasn1_devel_stub -RUNTIME_DEP_PKGS_CSWlibtasn1 = CSWlibtasn1-3 -RUNTIME_DEP_PKGS_CSWlibtasn1devel = CSWlibtasn1-3 +PACKAGES += CSWlibtasn1-utils +SPKG_DESC_CSWlibtasn1-utils = GNU ASN1 utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibtasn1-utils = CSWlibtasn1-3 +OBSOLETED_BY_CSWlibtasn1-utils = CSWlibtasn1 -SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/ - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - # We don't need it and if defined the test breaks LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-static -TEST_TARGET = check - -MERGE_DIRS_isa-extra = $(libdir) - -PKGFILES_CSWlibtasn1-3 = $(PKGFILES_RT) -PKGFILES_CSWlibtasn1devel = $(PKGFILES_DEVEL) - -CHECKPKG_OVERRIDES_CSWlibtasn1devel += surplus-dependency|CSWlibtasn1-3 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 13:47:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 11:47:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14525] csw/mgar/pkg/libflac8/trunk Message-ID: Revision: 14525 http://gar.svn.sourceforge.net/gar/?rev=14525&view=rev Author: dmichelsen Date: 2011-05-05 11:47:33 +0000 (Thu, 05 May 2011) Log Message: ----------- libflac8: Disable testsuite for now Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libflac8/trunk/bin/ Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-05-05 11:44:02 UTC (rev 14524) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-05-05 11:47:33 UTC (rev 14525) @@ -88,6 +88,9 @@ # XXX: Assembler optimization just doesn't work. Disable for now. CONFIGURE_ARGS += --disable-asm-optimizations +# Testsuite takes forever, disable once for new version +SKIPTEST ?= 1 + EXTRA_PAX_ARGS = -s ',$(docdir)/flac-$(VERSION),$(docdir)/flac,' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 14:04:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 12:04:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14526] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 14526 http://gar.svn.sourceforge.net/gar/?rev=14526&view=rev Author: dmichelsen Date: 2011-05-05 12:04:34 +0000 (Thu, 05 May 2011) Log Message: ----------- libidn: Update to 1.22 and new pkgfiles_lib idiom Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2011-05-05 11:47:33 UTC (rev 14525) +++ csw/mgar/pkg/libidn/trunk/Makefile 2011-05-05 12:04:34 UTC (rev 14526) @@ -1,5 +1,5 @@ NAME = libidn -VERSION = 1.21 +VERSION = 1.22 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -19,7 +19,7 @@ PACKAGES += CSWlibidn11 CATALOGNAME_CSWlibidn11 = libidn11 SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11 -PKGFILES_CSWlibidn11 += $(call baseisadirs,$(libdir),libidn\.so\.11(\.\d+)*) +PKGFILES_CSWlibidn11 += $(call pkgfiles_lib,libidn.so.11) RUNTIME_DEP_PKGS_CSWlibidn11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibidn11 += CSWiconv Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2011-05-05 11:47:33 UTC (rev 14525) +++ csw/mgar/pkg/libidn/trunk/checksums 2011-05-05 12:04:34 UTC (rev 14526) @@ -1 +1 @@ -80aba4e9503cd3ba6725cdbf265550f8 libidn-1.21.tar.gz +893a1df0cf3b28b72d248382eaeaca71 libidn-1.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 14:21:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 12:21:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14527] csw/mgar/pkg/libidn/trunk/Makefile Message-ID: Revision: 14527 http://gar.svn.sourceforge.net/gar/?rev=14527&view=rev Author: dmichelsen Date: 2011-05-05 12:21:30 +0000 (Thu, 05 May 2011) Log Message: ----------- libidn: Move message files to lib package Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2011-05-05 12:04:34 UTC (rev 14526) +++ csw/mgar/pkg/libidn/trunk/Makefile 2011-05-05 12:21:30 UTC (rev 14527) @@ -20,6 +20,7 @@ CATALOGNAME_CSWlibidn11 = libidn11 SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11 PKGFILES_CSWlibidn11 += $(call pkgfiles_lib,libidn.so.11) +PKGFILES_CSWlibidn11 += .*/libidn\.mo RUNTIME_DEP_PKGS_CSWlibidn11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibidn11 += CSWiconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 16:26:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 14:26:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14528] csw/mgar/pkg/rbgems Message-ID: Revision: 14528 http://gar.svn.sourceforge.net/gar/?rev=14528&view=rev Author: dmichelsen Date: 2011-05-05 14:26:51 +0000 (Thu, 05 May 2011) Log Message: ----------- rbgems/builder-2.1.2: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/builder-2.1.2/trunk/Makefile csw/mgar/pkg/rbgems/builder-2.1.2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/builder-2.1.2/ Modified: csw/mgar/pkg/rbgems/builder-2.1.2/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile 2011-05-04 15:49:47 UTC (rev 14514) +++ csw/mgar/pkg/rbgems/builder-2.1.2/trunk/Makefile 2011-05-05 14:26:51 UTC (rev 14528) @@ -1,5 +1,5 @@ NAME = builder -VERSION = 3.0.0 +VERSION = 2.1.2 CATEGORIES = rbgems DESCRIPTION = Builder provides a number of builder objects that make creating structured data simple to do @@ -17,6 +17,6 @@ EXTRA_GEM_INSTALL_ARGS += --no-ri # I think that is an example for mysql: -CHECKPKG_OVERRIDES_CSWrb18-builder-3-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/builder-3.0.0/TAGS +# CHECKPKG_OVERRIDES_CSWrb18-builder-3-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/builder-3.0.0/TAGS include gar/category.mk Modified: csw/mgar/pkg/rbgems/builder-2.1.2/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/builder-3.0.0/trunk/checksums 2011-05-04 15:49:47 UTC (rev 14514) +++ csw/mgar/pkg/rbgems/builder-2.1.2/trunk/checksums 2011-05-05 14:26:51 UTC (rev 14528) @@ -1 +1 @@ -cf9d2693d684a749e35dda886c4dc23c builder-3.0.0.gem +e96a525d9e0b42a2e2d5e77cbd02eb72 builder-2.1.2.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 5 16:56:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 May 2011 14:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14529] csw/mgar/pkg/tmux/trunk/Makefile Message-ID: Revision: 14529 http://gar.svn.sourceforge.net/gar/?rev=14529&view=rev Author: dmichelsen Date: 2011-05-05 14:56:20 +0000 (Thu, 05 May 2011) Log Message: ----------- tmux: Fix location of tmux.conf and defaults Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2011-05-05 14:26:51 UTC (rev 14528) +++ csw/mgar/pkg/tmux/trunk/Makefile 2011-05-05 14:56:20 UTC (rev 14529) @@ -11,9 +11,6 @@ # https://sourceforge.net/tracker/?func=detail&aid=3152389&group_id=200378&atid=973264 PATCHFILES = 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz - RUNTIME_DEP_PKGS = CSWlibevent2-0-5 BUILD_DEP_PKGS = CSWlibevent-devel @@ -29,15 +26,16 @@ INSTALL_SCRIPTS = custom -# New libevent2_0_5 has not been released, remove after release -CHECKPKG_OVERRIDES_CSWtmux += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tmux -CHECKPKG_OVERRIDES_CSWtmux += surplus-dependency|CSWlibevent2-0-5 -CHECKPKG_OVERRIDES_CSWtmux += unidentified-dependency|CSWlibevent2-0-5 - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) +post-extract-modulated: + @# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696 + perl -pi -e 's,/etc/tmux\.conf,$(sysconfdir)/tmux.conf,g' \ + $(WORKSRC)/tmux.h \ + $(WORKSRC)/tmux.1 + install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/tmux $(DESTDIR)$(bindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 5 22:53:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 05 May 2011 20:53:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14530] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 14530 http://gar.svn.sourceforge.net/gar/?rev=14530&view=rev Author: bdwalton Date: 2011-05-05 20:53:11 +0000 (Thu, 05 May 2011) Log Message: ----------- geos/trunk: drop unnecessary GARTYPE setting and add --enable-ruby configure option Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-05-05 14:56:20 UTC (rev 14529) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-05-05 20:53:11 UTC (rev 14530) @@ -11,8 +11,6 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.bz2 -GARTYPE = v2 - GARCOMPILER = GNU PACKAGES = CSWlibgeos3-2-2 @@ -51,4 +49,7 @@ RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1 OBSOLETED_BY_CSWlibgeos-dev = CSWgeos +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-ruby + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 6 09:20:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 May 2011 07:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14531] csw/mgar/pkg/libgpg_error/trunk/Makefile Message-ID: Revision: 14531 http://gar.svn.sourceforge.net/gar/?rev=14531&view=rev Author: dmichelsen Date: 2011-05-06 07:20:13 +0000 (Fri, 06 May 2011) Log Message: ----------- libgpg_error: Fix catalogname of stub Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2011-05-05 20:53:11 UTC (rev 14530) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2011-05-06 07:20:13 UTC (rev 14531) @@ -17,6 +17,7 @@ RUNTIME_DEP_PKGS_CSWgpg-error = CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWgpg-error += CSWlibintl8 OBSOLETED_BY_CSWgpg-error = CSWgpgerr +CATALOGNAME_CSWgpgerr = libgpg_error_stub PACKAGES += CSWlibgpg-error0 CATALOGNAME_CSWlibgpg-error0 = libgpg_error0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 6 09:26:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 May 2011 07:26:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14532] csw/mgar/pkg/rbgems Message-ID: Revision: 14532 http://gar.svn.sourceforge.net/gar/?rev=14532&view=rev Author: dmichelsen Date: 2011-05-06 07:26:00 +0000 (Fri, 06 May 2011) Log Message: ----------- rbgems/arel: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/arel/ csw/mgar/pkg/rbgems/arel/Makefile csw/mgar/pkg/rbgems/arel/branches/ csw/mgar/pkg/rbgems/arel/tags/ csw/mgar/pkg/rbgems/arel/trunk/ csw/mgar/pkg/rbgems/arel/trunk/Makefile csw/mgar/pkg/rbgems/arel/trunk/checksums csw/mgar/pkg/rbgems/arel/trunk/files/ Copied: csw/mgar/pkg/rbgems/arel/Makefile (from rev 14530, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/arel/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/arel/Makefile 2011-05-06 07:26:00 UTC (rev 14532) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/arel/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/arel/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/arel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/arel/trunk/Makefile 2011-05-06 07:26:00 UTC (rev 14532) @@ -0,0 +1,18 @@ +NAME = arel +VERSION = 2.0.9 +CATEGORIES = rbgems + +DESCRIPTION = Arel is a SQL AST manager for Ruby + +define BLURB + Arel is a SQL AST manager for Ruby. It 1. Simplifies the generationcomplex of SQL queries + 2. Adapts to various RDBMS systems It isintended to be a framework framework; + that is, you can build your ownORM with it, focusing on inovative object and colection + modeling as opposed to database compatibility and query generation. +endef + +LICENSE = MIT-LICENSE.txt + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/arel/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/arel/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/arel/trunk/checksums 2011-05-06 07:26:00 UTC (rev 14532) @@ -0,0 +1 @@ +e6a4c6749efe476ebb71b95354814dfb arel-2.0.9.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 6 10:36:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 May 2011 08:36:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14533] csw/mgar/pkg/rbgems Message-ID: Revision: 14533 http://gar.svn.sourceforge.net/gar/?rev=14533&view=rev Author: dmichelsen Date: 2011-05-06 08:36:49 +0000 (Fri, 06 May 2011) Log Message: ----------- rbgems/tzinfo: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/tzinfo/ csw/mgar/pkg/rbgems/tzinfo/Makefile csw/mgar/pkg/rbgems/tzinfo/branches/ csw/mgar/pkg/rbgems/tzinfo/tags/ csw/mgar/pkg/rbgems/tzinfo/trunk/ csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile csw/mgar/pkg/rbgems/tzinfo/trunk/checksums csw/mgar/pkg/rbgems/tzinfo/trunk/files/ Copied: csw/mgar/pkg/rbgems/tzinfo/Makefile (from rev 14530, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/tzinfo/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/tzinfo/Makefile 2011-05-06 08:36:49 UTC (rev 14533) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/tzinfo/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile 2011-05-06 08:36:49 UTC (rev 14533) @@ -0,0 +1,15 @@ +NAME = tzinfo +VERSION = 0.3.27 +CATEGORIES = rbgems + +DESCRIPTION = Daylight-savings aware timezone library + +define BLURB + TZInfo is a Ruby library that uses the standard tz (Olson) database toprovide daylight savings aware transformations betwen times indiferent time zones. +endef + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/tzinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/tzinfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/tzinfo/trunk/checksums 2011-05-06 08:36:49 UTC (rev 14533) @@ -0,0 +1 @@ +66c3e84a2fd7af9e70f3b551bee7e2b7 tzinfo-0.3.27.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri May 6 11:06:06 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 May 2011 09:06:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14534] csw/mgar/pkg/bind/trunk Message-ID: Revision: 14534 http://gar.svn.sourceforge.net/gar/?rev=14534&view=rev Author: bonivart Date: 2011-05-06 09:06:06 +0000 (Fri, 06 May 2011) Log Message: ----------- bind/trunk: Update to 9.8.0-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2011-05-06 08:36:49 UTC (rev 14533) +++ csw/mgar/pkg/bind/trunk/Makefile 2011-05-06 09:06:06 UTC (rev 14534) @@ -6,11 +6,11 @@ CATEGORIES = net # Enable these for Px-releases -#RELEASE = P3 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB @@ -21,12 +21,12 @@ endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -35,7 +35,7 @@ PACKAGES += CSWbind CATALOGNAME_CSWbind = bind SPKG_DESC_CSWbind = ISC BIND DNS main package -RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWosslrt CSWzlib CSWlibxml2-2 PACKAGES += CSWbind-dev CATALOGNAME_CSWbind-dev = bind_dev @@ -45,12 +45,12 @@ PACKAGES += CSWlibbind CATALOGNAME_CSWlibbind = libbind SPKG_DESC_CSWlibbind = ISC BIND DNS library package -RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWlibbind = CSWiconv CSWosslrt CSWzlib CSWlibxml2-2 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package -RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib +RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWosslrt CSWzlib CSWlibxml2-2 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot @@ -90,9 +90,6 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind -# Temporary override since package is being renamed -CHECKPKG_OVERRIDES_CSWbind-dev += file-collision - CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils CHECKPKG_OVERRIDES_CSWlibbind += non-uniform-lib-versions-in-package|sonames=libbind9.so.80,libdns.so.81,libisc.so.81,libisccc.so.80,libisccfg.so.80,liblwres.so.80 CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2011-05-06 08:36:49 UTC (rev 14533) +++ csw/mgar/pkg/bind/trunk/checksums 2011-05-06 09:06:06 UTC (rev 14534) @@ -1 +1 @@ -e802ac97ca419c2ddfc043509bcb17bc bind-9.8.0.tar.gz +d97ecd8f62a4cf4a769742c79cd8f921 bind-9.8.0-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri May 6 13:32:06 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 06 May 2011 11:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14535] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 14535 http://gar.svn.sourceforge.net/gar/?rev=14535&view=rev Author: aigoshin Date: 2011-05-06 11:32:06 +0000 (Fri, 06 May 2011) Log Message: ----------- nginx: dev 20110506 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-06 09:06:06 UTC (rev 14534) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-06 11:32:06 UTC (rev 14535) @@ -79,7 +79,7 @@ TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx -PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params +PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html NGINXDOCS = CHANGES CHANGES.ru LICENSE README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 6 15:48:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 May 2011 13:48:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14536] csw/mgar/pkg/gifsicle/trunk Message-ID: Revision: 14536 http://gar.svn.sourceforge.net/gar/?rev=14536&view=rev Author: dmichelsen Date: 2011-05-06 13:48:30 +0000 (Fri, 06 May 2011) Log Message: ----------- gifsicle: Update to 1.62 and latest defaults Modified Paths: -------------- csw/mgar/pkg/gifsicle/trunk/Makefile csw/mgar/pkg/gifsicle/trunk/checksums Modified: csw/mgar/pkg/gifsicle/trunk/Makefile =================================================================== --- csw/mgar/pkg/gifsicle/trunk/Makefile 2011-05-06 11:32:06 UTC (rev 14535) +++ csw/mgar/pkg/gifsicle/trunk/Makefile 2011-05-06 13:48:30 UTC (rev 14536) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = gifsicle -VERSION = 1.59 +VERSION = 1.62 CATEGORIES = utils DESCRIPTION = Tool for creating, editing, and getting information about GIF images @@ -8,13 +8,6 @@ endef MASTER_SITES = http://www.lcdf.org/gifsicle/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/gifsicle/trunk/checksums =================================================================== --- csw/mgar/pkg/gifsicle/trunk/checksums 2011-05-06 11:32:06 UTC (rev 14535) +++ csw/mgar/pkg/gifsicle/trunk/checksums 2011-05-06 13:48:30 UTC (rev 14536) @@ -1 +1 @@ -e6d21543a37e46e5da181dacf0bf0645 gifsicle-1.59.tar.gz +9a5d9eb3703017017ea0425196656a21 gifsicle-1.62.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri May 6 22:04:36 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 May 2011 20:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14537] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14537 http://gar.svn.sourceforge.net/gar/?rev=14537&view=rev Author: bdwalton Date: 2011-05-06 20:04:36 +0000 (Fri, 06 May 2011) Log Message: ----------- bacula/trunk: storage daemon needs mtx for tape changing via libexec/mtx-changer Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-06 13:48:30 UTC (rev 14536) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-06 20:04:36 UTC (rev 14537) @@ -143,6 +143,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 7 03:45:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 May 2011 01:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14538] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14538 http://gar.svn.sourceforge.net/gar/?rev=14538&view=rev Author: bdwalton Date: 2011-05-07 01:45:13 +0000 (Sat, 07 May 2011) Log Message: ----------- gdal/trunk: package split to lib, dev and bin (main) Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-05-06 20:04:36 UTC (rev 14537) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-05-07 01:45:13 UTC (rev 14538) @@ -12,6 +12,57 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-the-use-of-CSWbash.patch +PACKAGES += CSWgdal +CATALOGNAME_CSWgdal = gdal +SPKG_DESC_CSWgdal = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 +RUNTIME_DEP_PKGS_CSWgdal += CSWcurlrt +RUNTIME_DEP_PKGS_CSWgdal += CSWexpat +RUNTIME_DEP_PKGS_CSWgdal += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgdal += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgdal += CSWgiflibrt +RUNTIME_DEP_PKGS_CSWgdal += CSWhdf5rt +RUNTIME_DEP_PKGS_CSWgdal += CSWjasper +RUNTIME_DEP_PKGS_CSWgdal += CSWjpeg +RUNTIME_DEP_PKGS_CSWgdal += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibnetcdf6 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWgdal += CSWoldaprt +RUNTIME_DEP_PKGS_CSWgdal += CSWosslrt +RUNTIME_DEP_PKGS_CSWgdal += CSWpng +RUNTIME_DEP_PKGS_CSWgdal += CSWtiff +RUNTIME_DEP_PKGS_CSWgdal += CSWzlib + +PACKAGES += CSWlibgdal1 +CATALOGNAME_CSWlibgdal1 = libgdal1 +SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWcurlrt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWgiflibrt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWhdf5rt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf6 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWpng +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWzlib +PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) +PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) + +PACKAGES += CSWgdal-dev +CATALOGNAME_CSWgdal-dev = gdal_dev +SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files +RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 +PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) + GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 7 03:46:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 May 2011 01:46:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14539] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 14539 http://gar.svn.sourceforge.net/gar/?rev=14539&view=rev Author: bdwalton Date: 2011-05-07 01:46:32 +0000 (Sat, 07 May 2011) Log Message: ----------- gdal/trunk: handle funky postgres setup Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2011-05-07 01:45:13 UTC (rev 14538) +++ csw/mgar/pkg/gdal/trunk/Makefile 2011-05-07 01:46:32 UTC (rev 14539) @@ -72,7 +72,7 @@ CONFIGURE_ARGS += --with-jpeg=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5/bin/mysql_config -CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/sparcv8/pg_config + CONFIGURE_ARGS += --with-sqlite3=$(prefix) # doesn't have tests? @@ -81,3 +81,9 @@ LICENSE = LICENSE.TXT include gar/category.mk + +ifeq ($(GARCH),sparc) +CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/sparcv8/pg_config +else +CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 7 04:54:39 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 07 May 2011 02:54:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14540] csw/mgar/pkg/geos/trunk/Makefile Message-ID: Revision: 14540 http://gar.svn.sourceforge.net/gar/?rev=14540&view=rev Author: bdwalton Date: 2011-05-07 02:54:39 +0000 (Sat, 07 May 2011) Log Message: ----------- geos/trunk: carve out the package holding the ruby bindings Modified Paths: -------------- csw/mgar/pkg/geos/trunk/Makefile Modified: csw/mgar/pkg/geos/trunk/Makefile =================================================================== --- csw/mgar/pkg/geos/trunk/Makefile 2011-05-07 01:46:32 UTC (rev 14539) +++ csw/mgar/pkg/geos/trunk/Makefile 2011-05-07 02:54:39 UTC (rev 14540) @@ -16,7 +16,19 @@ PACKAGES = CSWlibgeos3-2-2 PACKAGES += CSWlibgeos-c1 PACKAGES += CSWgeos-dev +PACKAGES += CSWrb18-geos3-2-2 +CATALOGNAME_CSWrb18-geos3-2-2 = rb18_geos3_2_2 +SPKG_DESC_CSWrb18-geos3-2-2 += $(DESCRIPTION), ruby 1.8 bindings +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 = CSWruby18 +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos-c1 +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWrb18-geos3-2-2 += CSWlibgeos3-2-2 +PKGFILES_CSWrb18-geos3-2-2 += .*ruby.* +CHECKPKG_OVERRIDES_CSWrb18-geos3-2-2 += surplus-dependency|CSWruby18 + CATALOGNAME_CSWlibgeos3-2-2 = libgeos3_2_2 SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat May 7 13:13:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 May 2011 11:13:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14541] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 14541 http://gar.svn.sourceforge.net/gar/?rev=14541&view=rev Author: rthurner Date: 2011-05-07 11:13:10 +0000 (Sat, 07 May 2011) Log Message: ----------- mercurial: undo packagecheck changes, needs a dedicated exclusion Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-07 02:54:39 UTC (rev 14540) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-05-07 11:13:10 UTC (rev 14541) @@ -20,6 +20,9 @@ TEST_SCRIPTS = #TEST_TARGET = #tests +CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ + include gar/category.mk pre-build-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat May 7 13:42:05 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 May 2011 11:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14542] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 14542 http://gar.svn.sourceforge.net/gar/?rev=14542&view=rev Author: rthurner Date: 2011-05-07 11:42:04 +0000 (Sat, 07 May 2011) Log Message: ----------- subversion, split up the packages variable Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-05-07 11:13:10 UTC (rev 14541) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-05-07 11:42:04 UTC (rev 14542) @@ -37,10 +37,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn -PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn -PACKAGES += CSWsvn-contrib CSWsvn-tools - +PACKAGES = CSWsvn SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 @@ -57,6 +54,7 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWapr-util +PACKAGES += CSWsvn-devel SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel ARCHALL_CSWsvn-devel = 1 @@ -64,6 +62,7 @@ PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW CHECKPKG_OVERRIDES_CSWsvn-devel += archall-devel-package +PACKAGES += CSWsvn-contrib SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts CATALOGNAME_CSWsvn-contrib = subversion_contrib PKGFILES_CSWsvn-contrib = $(docdir)/subversion/contrib.* @@ -72,6 +71,7 @@ CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon +PACKAGES += CSWsvn-tools SPKG_DESC_CSWsvn-tools = Additional subversion tools CATALOGNAME_CSWsvn-tools = subversion_tools PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* @@ -81,6 +81,7 @@ CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon +PACKAGES += CSWap2svn SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion RUNTIME_DEP_PKGS_CSWap2svn = CSWsvn @@ -90,6 +91,7 @@ PKGFILES_CSWap2svn = $(prefix)/apache2.* PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW +PACKAGES += CSWjavasvn SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* @@ -108,6 +110,7 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion PKGFILES_CSWpmsvn = $(libdir)/perl.* @@ -124,6 +127,7 @@ RUNTIME_DEP_PKGS_CSWpmsvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWpmsvn += CSWapr +PACKAGES += CSWrbsvn SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn PKGFILES_CSWrbsvn = $(libdir)/ruby.* @@ -141,6 +145,7 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby1 +PACKAGES += CSWpythonsvn SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding CATALOGNAME_CSWpythonsvn = pythonsvn PKGFILES_CSWpythonsvn = $(libdir)/python.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun May 8 13:40:10 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 08 May 2011 11:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14543] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 14543 http://gar.svn.sourceforge.net/gar/?rev=14543&view=rev Author: idogan23 Date: 2011-05-08 11:40:10 +0000 (Sun, 08 May 2011) Log Message: ----------- libldns: x86 conflicts Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2011-05-07 11:42:04 UTC (rev 14542) +++ csw/mgar/pkg/libldns/trunk/Makefile 2011-05-08 11:40:10 UTC (rev 14543) @@ -544,5 +544,7 @@ CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/sparcv8plus+vis/libldns.so|CSWlibldns-devel|CSWlibldnsdevel CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new_frm_type.3|CSWlibldns-devel|CSWlibldnsdevel CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_normal_rrset.3|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/amd64/libldns.so|CSWlibldns-devel|CSWlibldnsdevel +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/pentium_pro/libldns.so|CSWlibldns-devel|CSWlibldnsdevel include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sun May 8 15:28:30 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 08 May 2011 13:28:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14544] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 14544 http://gar.svn.sourceforge.net/gar/?rev=14544&view=rev Author: aigoshin Date: 2011-05-08 13:28:29 +0000 (Sun, 08 May 2011) Log Message: ----------- nginx: dev 20110508 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-08 11:40:10 UTC (rev 14543) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-08 13:28:29 UTC (rev 14544) @@ -107,4 +107,5 @@ cd $(WORKSRC); \ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx + rm $(DESTDIR)/var/run/nginx $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 8 19:29:01 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 08 May 2011 17:29:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14545] csw/mgar/pkg Message-ID: Revision: 14545 http://gar.svn.sourceforge.net/gar/?rev=14545&view=rev Author: rthurner Date: 2011-05-08 17:29:01 +0000 (Sun, 08 May 2011) Log Message: ----------- subversion-client: first version, nothing in the recipe yet to either-or allow subversion or subverison client to be installed Added Paths: ----------- csw/mgar/pkg/subversion-client/ csw/mgar/pkg/subversion-client/Makefile csw/mgar/pkg/subversion-client/branches/ csw/mgar/pkg/subversion-client/tags/ csw/mgar/pkg/subversion-client/trunk/ csw/mgar/pkg/subversion-client/trunk/Makefile csw/mgar/pkg/subversion-client/trunk/checksums csw/mgar/pkg/subversion-client/trunk/files/ csw/mgar/pkg/subversion-client/trunk/files/fixme.sh Copied: csw/mgar/pkg/subversion-client/Makefile (from rev 14537, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/subversion-client/Makefile (rev 0) +++ csw/mgar/pkg/subversion-client/Makefile 2011-05-08 17:29:01 UTC (rev 14545) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/subversion-client/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/subversion-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion-client/trunk/Makefile (rev 0) +++ csw/mgar/pkg/subversion-client/trunk/Makefile 2011-05-08 17:29:01 UTC (rev 14545) @@ -0,0 +1,64 @@ +# $Id$ +# + +NAME = svn-client +VERSION = 1.6.16 +DISTNAME = subversion-$(VERSION) +CATEGORIES = utils + +DESCRIPTION = subversion version control, client +define BLURB + The goal of the Subversion project is to build a version control system + that is a compelling replacement for CVS in the open source community. +endef + +VENDOR_URL = http://subversion.apache.org/ +MASTER_SITES = http://subversion.tigris.org/downloads/ +#MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ +DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += fixme.sh + +UFILES_REGEX = subversion-(\d+(?:\.\d+)*).tar.bz2 + + +PACKAGES = CSWsvn-client +SPKG_DESC_CSWsvn = subversion version control client +CATALOGNAME_CSWsvn = svn-client +RUNTIME_DEP_PKGS_CSWsvn += CSWexpat +RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt +RUNTIME_DEP_PKGS_CSWsvn += CSWiconv +RUNTIME_DEP_PKGS_CSWsvn += CSWneon +RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf0-0 +RUNTIME_DEP_PKGS_CSWsvn += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsvn += CSWsasl +RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWsvn += CSWzlib +RUNTIME_DEP_PKGS_CSWsvn += CSWapr +RUNTIME_DEP_PKGS_CSWsvn += CSWapr-util + +EXTRA_LINKER_FLAGS = -lintl -liconv + +# Only add $ISALIST to dirs which ship optimized versions (done by explicitly +# excluding those lib dirs which are known not to ship optimized versions). +RUNPATH_ISALIST = $(libdir) + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-apxs +CONFIGURE_ARGS += --without-berkeley-db +CONFIGURE_ARGS += --with-neon=$(prefix) +CONFIGURE_ARGS += --with-serf=$(prefix) +CONFIGURE_ARGS += --with-ssl=$(PREFIX) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --without-swig +CONFIGURE_ARGS += --with-zlib=$(prefix) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-modulated: + @echo "~~~ Fixing Libtool ~~~" + $(DOWNLOADDIR)/fixme.sh $(WORKSRC) + Property changes on: csw/mgar/pkg/subversion-client/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/subversion-client/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion-client/trunk/checksums (rev 0) +++ csw/mgar/pkg/subversion-client/trunk/checksums 2011-05-08 17:29:01 UTC (rev 14545) @@ -0,0 +1 @@ +32f25a6724559fe8691d1f57a63f636e subversion-1.6.16.tar.bz2 Added: csw/mgar/pkg/subversion-client/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/subversion-client/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/subversion-client/trunk/files/fixme.sh 2011-05-08 17:29:01 UTC (rev 14545) @@ -0,0 +1,49 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} +done + +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + Property changes on: csw/mgar/pkg/subversion-client/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 8 19:46:49 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 08 May 2011 17:46:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14546] csw/mgar/pkg/scala/trunk/Makefile Message-ID: Revision: 14546 http://gar.svn.sourceforge.net/gar/?rev=14546&view=rev Author: rthurner Date: 2011-05-08 17:46:49 +0000 (Sun, 08 May 2011) Log Message: ----------- scala: upgrade to new version of checkpkg, by just ignoring the additional errors Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2011-05-08 17:29:01 UTC (rev 14545) +++ csw/mgar/pkg/scala/trunk/Makefile 2011-05-08 17:46:49 UTC (rev 14546) @@ -28,6 +28,17 @@ PRESERVECONF = .*/meta/[^/]+ .*/config/[^/]+ +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/share|root/opt/csw/share/scala/misc/scala-tool-support/scite/README +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/share|root/opt/csw/share/scala/misc/scala-tool-support/kate/README +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/share|root/opt/csw/share/scala/misc/scala-tool-support/gedit/README +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/share|root/opt/csw/share/scala/misc/scala-tool-support/a2ps/README +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/scala/misc/scala-tool-support/jedit/console/commando/scala.xml +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/scala/misc/scala-tool-support/jedit/console/commando/scalac.xml +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/scala.1 +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/scalac.1 +CHECKPKG_OVERRIDES_CSWscala += license-missing|/opt/csw/share/doc/scala/license +CHECKPKG_OVERRIDES_CSWscala += missing-dependency|CSWemacscommon + include gar/category.mk install-dirs: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 8 20:51:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 08 May 2011 18:51:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14547] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14547 http://gar.svn.sourceforge.net/gar/?rev=14547&view=rev Author: bdwalton Date: 2011-05-08 18:51:19 +0000 (Sun, 08 May 2011) Log Message: ----------- cswutils/trunk: install ksh checkpkg as an alternative named checkpkg.legacy, add alternatives support Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-08 17:46:49 UTC (rev 14546) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-08 18:51:19 UTC (rev 14547) @@ -65,11 +65,14 @@ CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/package_checks_test.py CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/testdata/rpaths.py +ALTERNATIVES_CSWcswutils = checkpkg +ALTERNATIVE_checkpkg = /opt/csw/bin/checkpkg checkpkg /opt/csw/bin/checkpkg.legacy 5 + include gar/category.mk install-custom: @ginstall -d $(DESTDIR)$(bindir) - @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir)/checkpkg.legacy @ginstall $(WORKSRC)/cpan2pkg $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/createpkg $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/stagepkg $(DESTDIR)$(bindir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 8 21:58:05 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 08 May 2011 19:58:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14548] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 14548 http://gar.svn.sourceforge.net/gar/?rev=14548&view=rev Author: rthurner Date: 2011-05-08 19:58:05 +0000 (Sun, 08 May 2011) Log Message: ----------- libserf: correct uwatch Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-05-08 18:51:19 UTC (rev 14547) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-05-08 19:58:05 UTC (rev 14548) @@ -18,7 +18,7 @@ DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = serf-(\d+(?:\.\d+)*).tar.bz2 OBSOLETED_BY_CSWlibserf0-0 = CSWlibserf OBSOLETED_BY_CSWlibserf-dev = CSWlibserf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 8 22:22:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 08 May 2011 20:22:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14549] csw/mgar/pkg/subversion-client/trunk/Makefile Message-ID: Revision: 14549 http://gar.svn.sourceforge.net/gar/?rev=14549&view=rev Author: rthurner Date: 2011-05-08 20:22:09 +0000 (Sun, 08 May 2011) Log Message: ----------- subversion-client: correct package names Modified Paths: -------------- csw/mgar/pkg/subversion-client/trunk/Makefile Modified: csw/mgar/pkg/subversion-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion-client/trunk/Makefile 2011-05-08 19:58:05 UTC (rev 14548) +++ csw/mgar/pkg/subversion-client/trunk/Makefile 2011-05-08 20:22:09 UTC (rev 14549) @@ -22,19 +22,20 @@ PACKAGES = CSWsvn-client -SPKG_DESC_CSWsvn = subversion version control client -CATALOGNAME_CSWsvn = svn-client -RUNTIME_DEP_PKGS_CSWsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWsvn += CSWggettextrt -RUNTIME_DEP_PKGS_CSWsvn += CSWiconv -RUNTIME_DEP_PKGS_CSWsvn += CSWneon -RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf0-0 -RUNTIME_DEP_PKGS_CSWsvn += CSWoldaprt -RUNTIME_DEP_PKGS_CSWsvn += CSWsasl -RUNTIME_DEP_PKGS_CSWsvn += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWsvn += CSWzlib -RUNTIME_DEP_PKGS_CSWsvn += CSWapr -RUNTIME_DEP_PKGS_CSWsvn += CSWapr-util +SPKG_DESC_CSWsvn-client = subversion version control client +CATALOGNAME_CSWsvn-client = svn-client +RUNTIME_DEP_PKGS_CSWsvn-client += CSWapr +RUNTIME_DEP_PKGS_CSWsvn-client += CSWapr-util +RUNTIME_DEP_PKGS_CSWsvn-client += CSWexpat +RUNTIME_DEP_PKGS_CSWsvn-client += CSWiconv +RUNTIME_DEP_PKGS_CSWsvn-client += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsvn-client += CSWlibserf0-0 +RUNTIME_DEP_PKGS_CSWsvn-client += CSWlibneon27 +RUNTIME_DEP_PKGS_CSWsvn-client += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsvn-client += CSWosslrt +RUNTIME_DEP_PKGS_CSWsvn-client += CSWsasl +RUNTIME_DEP_PKGS_CSWsvn-client += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWsvn-client += CSWzlib EXTRA_LINKER_FLAGS = -lintl -liconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 8 22:24:22 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 08 May 2011 20:24:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14550] csw/mgar/pkg/libneon27/trunk Message-ID: Revision: 14550 http://gar.svn.sourceforge.net/gar/?rev=14550&view=rev Author: rthurner Date: 2011-05-08 20:24:21 +0000 (Sun, 08 May 2011) Log Message: ----------- libneon27: upgrade to neon-0.29.6 Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile csw/mgar/pkg/libneon27/trunk/checksums Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2011-05-08 20:22:09 UTC (rev 14549) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-05-08 20:24:21 UTC (rev 14550) @@ -1,5 +1,5 @@ NAME = neon -VERSION = 0.29.5 +VERSION = 0.29.6 CATEGORIES = lib EXTRA_MODULATORS = FEATURES Modified: csw/mgar/pkg/libneon27/trunk/checksums =================================================================== --- csw/mgar/pkg/libneon27/trunk/checksums 2011-05-08 20:22:09 UTC (rev 14549) +++ csw/mgar/pkg/libneon27/trunk/checksums 2011-05-08 20:24:21 UTC (rev 14550) @@ -1,2 +1,2 @@ 608826974d5644ee7967a713fa72cf36 COPYING -ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz +591e0c82e6979e7e615211b386b8f6bc neon-0.29.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun May 8 22:41:12 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 8 May 2011 21:41:12 +0100 Subject: [csw-devel] SF.net SVN: gar:[14546] csw/mgar/pkg/scala/trunk/Makefile In-Reply-To: References: Message-ID: 2011/5/8 : > CHECKPKG_OVERRIDES_CSWscala += license-missing|/opt/csw/share/doc/scala/license You should not override the license error. We need to ship license files. From maciej at opencsw.org Sun May 8 22:43:05 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 8 May 2011 21:43:05 +0100 Subject: [csw-devel] SF.net SVN: gar:[14549] csw/mgar/pkg/subversion-client/trunk/Makefile In-Reply-To: References: Message-ID: 2011/5/8 : > CATALOGNAME_CSWsvn-client ? ? ? = svn-client You need to use an underscore for the catalog name: svn_client. From rthurner at users.sourceforge.net Mon May 9 05:27:57 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 09 May 2011 03:27:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14551] csw/mgar/pkg/subversion-client/trunk/Makefile Message-ID: Revision: 14551 http://gar.svn.sourceforge.net/gar/?rev=14551&view=rev Author: rthurner Date: 2011-05-09 03:27:56 +0000 (Mon, 09 May 2011) Log Message: ----------- subversion-client: catalog name need not to have -, but _ Modified Paths: -------------- csw/mgar/pkg/subversion-client/trunk/Makefile Modified: csw/mgar/pkg/subversion-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion-client/trunk/Makefile 2011-05-08 20:24:21 UTC (rev 14550) +++ csw/mgar/pkg/subversion-client/trunk/Makefile 2011-05-09 03:27:56 UTC (rev 14551) @@ -1,9 +1,9 @@ # $Id$ # -NAME = svn-client -VERSION = 1.6.16 -DISTNAME = subversion-$(VERSION) +NAME = svn-client +VERSION = 1.6.16 +DISTNAME = subversion-$(VERSION) CATEGORIES = utils DESCRIPTION = subversion version control, client @@ -12,18 +12,17 @@ that is a compelling replacement for CVS in the open source community. endef -VENDOR_URL = http://subversion.apache.org/ -MASTER_SITES = http://subversion.tigris.org/downloads/ -#MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ -DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES += fixme.sh +VENDOR_URL = http://subversion.apache.org/ +MASTER_SITES = http://subversion.tigris.org/downloads/ +DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += fixme.sh UFILES_REGEX = subversion-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWsvn-client +PACKAGES = CSWsvn-client SPKG_DESC_CSWsvn-client = subversion version control client -CATALOGNAME_CSWsvn-client = svn-client +CATALOGNAME_CSWsvn-client = svn_client RUNTIME_DEP_PKGS_CSWsvn-client += CSWapr RUNTIME_DEP_PKGS_CSWsvn-client += CSWapr-util RUNTIME_DEP_PKGS_CSWsvn-client += CSWexpat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon May 9 05:33:28 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 09 May 2011 03:33:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14552] csw/mgar/pkg/scala/trunk Message-ID: Revision: 14552 http://gar.svn.sourceforge.net/gar/?rev=14552&view=rev Author: rthurner Date: 2011-05-09 03:33:28 +0000 (Mon, 09 May 2011) Log Message: ----------- scala: a license file is needed ... Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile csw/mgar/pkg/scala/trunk/checksums Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2011-05-09 03:27:56 UTC (rev 14551) +++ csw/mgar/pkg/scala/trunk/Makefile 2011-05-09 03:33:28 UTC (rev 14552) @@ -1,5 +1,5 @@ NAME = scala -VERSION = 2.7.7 +VERSION = 2.8.1 CATEGORIES = java DESCRIPTION = The Scala programming language @@ -36,7 +36,7 @@ CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/scala/misc/scala-tool-support/jedit/console/commando/scalac.xml CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/scala.1 CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/scalac.1 -CHECKPKG_OVERRIDES_CSWscala += license-missing|/opt/csw/share/doc/scala/license +CHECKPKG_OVERRIDES_CSWscala += file-with-bad-content|/usr/share|root/opt/csw/share/scala/misc/scala-tool-support/gedit/scala.lang CHECKPKG_OVERRIDES_CSWscala += missing-dependency|CSWemacscommon include gar/category.mk Modified: csw/mgar/pkg/scala/trunk/checksums =================================================================== --- csw/mgar/pkg/scala/trunk/checksums 2011-05-09 03:27:56 UTC (rev 14551) +++ csw/mgar/pkg/scala/trunk/checksums 2011-05-09 03:33:28 UTC (rev 14552) @@ -1 +1 @@ -5d2294d5aab72fec869c0ba666d28b7e scala-2.7.7.final.tgz +4fa66742341b5c9f6877ce64d409cb92 scala-2.8.1.final.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue May 10 13:45:47 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 10 May 2011 11:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14553] csw/mgar/pkg/puppet/trunk/files Message-ID: Revision: 14553 http://gar.svn.sourceforge.net/gar/?rev=14553&view=rev Author: phipsy Date: 2011-05-10 11:45:46 +0000 (Tue, 10 May 2011) Log Message: ----------- Fixed puppet bugs 4767 and 4725 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-09 03:33:28 UTC (rev 14552) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-10 11:45:46 UTC (rev 14553) @@ -20,7 +20,7 @@ fi fi -if [ ! -d $PKG_INSTALL_ROOT/opt/csw/var/puppet ]; then +if [ ! -d $PKG_INSTALL_ROOT/opt/csw/var/puppet -o ! -L $PKG_INSTALL_ROOT/opt/csw/var/puppet ]; then /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /opt/csw/var/puppet fi Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-05-09 03:33:28 UTC (rev 14552) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-05-10 11:45:46 UTC (rev 14553) @@ -4,6 +4,9 @@ # # /etc/opt/csw/init.d/cswpuppetd # +# 2011-05-06 Mark Phillips +# * Check if we're on Solaris 10 before including the smf_include stuff +# # 2011-03-06 Mark Phillips # * Added getprop - not used, yet # @@ -17,7 +20,10 @@ # 2009-11-23 Gary Law # * changed sbindir -. /lib/svc/share/smf_include.sh +# Check if we're on 10; therefore SMF +if [ -x /usr/sbin/svcadm ]; then + . /lib/svc/share/smf_include.sh +fi prefix="/opt/csw" exec_prefix="/opt/csw" @@ -89,7 +95,7 @@ echo "${__pidfile}" } -pidfile=`get_pid_file` +pidfile=`$prefix/bin/puppet agent --genconf | awk '/pidfile/ { print $3 }'` case "$1" in start) Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-05-09 03:33:28 UTC (rev 14552) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-05-10 11:45:46 UTC (rev 14553) @@ -1,19 +1,25 @@ #!/bin/sh # +# 2011-05-06 Mark Phillips +# * Check if we're on Solaris 10 before including the smf_include stuff +# # 2011-03-06 Mark Phillips # * Added getprop # # 2009-11-23 Gary Law # * Original version -. /lib/svc/share/smf_include.sh +# Check if we're on 10; therefore SMF +if [ -x /usr/sbin/svcadm ]; then + . /lib/svc/share/smf_include.sh +fi prefix=/opt/csw exec_prefix=/opt/csw sysconfdir=/opt/csw/etc sbindir=/opt/csw/sbin -pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid +pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'` getprop() { val=`/usr/bin/svcprop -p $1 $SMF_FMRI` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue May 10 14:55:21 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 10 May 2011 12:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14554] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 14554 http://gar.svn.sourceforge.net/gar/?rev=14554&view=rev Author: aigoshin Date: 2011-05-10 12:55:21 +0000 (Tue, 10 May 2011) Log Message: ----------- nginx: release 20110510 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-10 11:45:46 UTC (rev 14553) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-10 12:55:21 UTC (rev 14554) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.0.1 +VERSION = 1.0.2 CATEGORIES = server GARCOMPILER = SOS11 @@ -74,7 +74,7 @@ CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module -CHECKPKG_OVERRIDES_CSWnginx += bad-location-of-file|file=/var/run/nginx +#CHECKPKG_OVERRIDES_CSWnginx += bad-location-of-file|file=/var/run/nginx TEST_SCRIPTS = Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-05-10 11:45:46 UTC (rev 14553) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-05-10 12:55:21 UTC (rev 14554) @@ -1 +1 @@ -4d4e70e3c6c907cb101c97e9cf9399c8 nginx-1.0.1.tar.gz +8a528ccaab3ddba84e72443fa40b19e7 nginx-1.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue May 10 16:15:47 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 10 May 2011 14:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14555] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 14555 http://gar.svn.sourceforge.net/gar/?rev=14555&view=rev Author: aigoshin Date: 2011-05-10 14:15:47 +0000 (Tue, 10 May 2011) Log Message: ----------- nginx: release 20110510 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-10 12:55:21 UTC (rev 14554) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-10 14:15:47 UTC (rev 14555) @@ -107,5 +107,5 @@ cd $(WORKSRC); \ cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx - rm $(DESTDIR)/var/run/nginx + rm -rf $(DESTDIR)/var/run/nginx $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 10 16:29:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 May 2011 14:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14556] csw/mgar/pkg/unrealircd/trunk/Makefile Message-ID: Revision: 14556 http://gar.svn.sourceforge.net/gar/?rev=14556&view=rev Author: wahwah Date: 2011-05-10 14:29:29 +0000 (Tue, 10 May 2011) Log Message: ----------- pkg/unrealircd/trunk: configure stage completes, compilation doesn't Modified Paths: -------------- csw/mgar/pkg/unrealircd/trunk/Makefile Modified: csw/mgar/pkg/unrealircd/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrealircd/trunk/Makefile 2011-05-10 14:15:47 UTC (rev 14555) +++ csw/mgar/pkg/unrealircd/trunk/Makefile 2011-05-10 14:29:29 UTC (rev 14556) @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# Preliminary work done. It does not compile with Sun CC, there's a syntax -# error. With GCC, it fails when it doesn't find tre/regex.h, even though -# it's available in /opt/csw/include/tre/regex.h. The unrealircd build system -# seems to ignore CPPFLAGS. To be investigated. +# Compilation with GCC fails: +# /opt/csw/gcc4/lib/gcc/sparc-sun-solaris2.8/4.3.3/include-fixed/ctype.h:58: +# error: expected ')' before '>=' token NAME = Unreal VERSION = 3.2.8.1 @@ -17,7 +16,25 @@ SPKG_SOURCEURL = http://www.unrealircd.com MASTER_SITES = http://www.unrealircd.com/downloads/ DISTFILES = $(NAME)$(VERSION).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-showlistmodes +CONFIGURE_ARGS += --enable-hub +CONFIGURE_ARGS += --enable-ssl=/opt/csw +CONFIGURE_ARGS += --enable-ziplinks=/opt/csw/lib +CONFIGURE_ARGS += --enable-inet6 +CONFIGURE_ARGS += --enable-prefixaq +CONFIGURE_ARGS += --with-listen=5 +CONFIGURE_ARGS += --with-dpath=/etc/opt/csw +CONFIGURE_ARGS += --with-spath=/opt/csw/bin/ircd +CONFIGURE_ARGS += --with-nick-history=2000 +CONFIGURE_ARGS += --with-sendq=3000000 +CONFIGURE_ARGS += --with-bufferpool=18 +CONFIGURE_ARGS += --with-hostname=unstable9s +CONFIGURE_ARGS += --with-permissions=0600 +CONFIGURE_ARGS += --with-fd-setsize=1024 +CONFIGURE_ARGS += --enable-dynamic-linking + BUILD_DEP_PKGS = CSWtre-dev GARCOMPILER = GNU + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 11 11:06:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 May 2011 09:06:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14557] csw/mgar/pkg/file/trunk Message-ID: Revision: 14557 http://gar.svn.sourceforge.net/gar/?rev=14557&view=rev Author: wahwah Date: 2011-05-11 09:06:23 +0000 (Wed, 11 May 2011) Log Message: ----------- pkg/file/trunk: Upgrade to 5.07 Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-05-10 14:29:29 UTC (rev 14556) +++ csw/mgar/pkg/file/trunk/Makefile 2011-05-11 09:06:23 UTC (rev 14557) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.05 +VERSION = 5.07 CATEGORIES = utils define BLURB @@ -29,7 +29,7 @@ PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch -NOISAEXEC = 1 +ISAEXEC = 0 PACKAGES += CSWgfile PKGFILES_CSWgfile += $(bindir)/gfile Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2011-05-10 14:29:29 UTC (rev 14556) +++ csw/mgar/pkg/file/trunk/checksums 2011-05-11 09:06:23 UTC (rev 14557) @@ -1 +1 @@ -0b429063710457be2bd17a18389cb018 file-5.05.tar.gz +b8d1f9a8a644067bd0a703cebf3f4858 file-5.07.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 11 13:20:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 May 2011 11:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14558] csw/mgar/pkg/unrealircd/trunk Message-ID: Revision: 14558 http://gar.svn.sourceforge.net/gar/?rev=14558&view=rev Author: dmichelsen Date: 2011-05-11 11:20:15 +0000 (Wed, 11 May 2011) Log Message: ----------- unrealircd: Make it compile Modified Paths: -------------- csw/mgar/pkg/unrealircd/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch Modified: csw/mgar/pkg/unrealircd/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrealircd/trunk/Makefile 2011-05-11 09:06:23 UTC (rev 14557) +++ csw/mgar/pkg/unrealircd/trunk/Makefile 2011-05-11 11:20:15 UTC (rev 14558) @@ -2,39 +2,50 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# Compilation with GCC fails: -# /opt/csw/gcc4/lib/gcc/sparc-sun-solaris2.8/4.3.3/include-fixed/ctype.h:58: -# error: expected ')' before '>=' token - NAME = Unreal VERSION = 3.2.8.1 -CATEGORIES = lib +CATEGORIES = server + DESCRIPTION = Open Source IRC Server DISTNAME = $(NAME)3.2 + define BLURB endef -SPKG_SOURCEURL = http://www.unrealircd.com + MASTER_SITES = http://www.unrealircd.com/downloads/ + DISTFILES = $(NAME)$(VERSION).tar.gz -CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --with-showlistmodes -CONFIGURE_ARGS += --enable-hub -CONFIGURE_ARGS += --enable-ssl=/opt/csw -CONFIGURE_ARGS += --enable-ziplinks=/opt/csw/lib -CONFIGURE_ARGS += --enable-inet6 -CONFIGURE_ARGS += --enable-prefixaq -CONFIGURE_ARGS += --with-listen=5 -CONFIGURE_ARGS += --with-dpath=/etc/opt/csw -CONFIGURE_ARGS += --with-spath=/opt/csw/bin/ircd -CONFIGURE_ARGS += --with-nick-history=2000 -CONFIGURE_ARGS += --with-sendq=3000000 -CONFIGURE_ARGS += --with-bufferpool=18 -CONFIGURE_ARGS += --with-hostname=unstable9s -CONFIGURE_ARGS += --with-permissions=0600 -CONFIGURE_ARGS += --with-fd-setsize=1024 -CONFIGURE_ARGS += --enable-dynamic-linking +PATCHFILES += 0001-Remove-inline-as-it-confuses-the-compiler.patch -BUILD_DEP_PKGS = CSWtre-dev -GARCOMPILER = GNU +VENDOR_URL = http://www.unrealircd.com + +CONFIGURE_ARGS += --prefix=$(prefix) +#CONFIGURE_ARGS += $(DIRPATHS) +#CONFIGURE_ARGS += --with-showlistmodes +#CONFIGURE_ARGS += --enable-hub +#CONFIGURE_ARGS += --enable-ssl=/opt/csw +#CONFIGURE_ARGS += --enable-ziplinks=/opt/csw/lib +#CONFIGURE_ARGS += --enable-inet6 +#CONFIGURE_ARGS += --enable-prefixaq +#CONFIGURE_ARGS += --with-listen=5 +#CONFIGURE_ARGS += --with-dpath=/etc/opt/csw +#CONFIGURE_ARGS += --with-spath=/opt/csw/bin/ircd +#CONFIGURE_ARGS += --with-nick-history=2000 +#CONFIGURE_ARGS += --with-sendq=3000000 +#CONFIGURE_ARGS += --with-bufferpool=18 +#CONFIGURE_ARGS += --with-hostname=unstable9s +#CONFIGURE_ARGS += --with-permissions=0600 +#CONFIGURE_ARGS += --with-fd-setsize=1024 +#CONFIGURE_ARGS += --enable-dynamic-linking + +# BUILD_DEP_PKGS = CSWtre-dev +# GARCOMPILER = GNU + +CFLAGS = +CPPFLAGS = +LDFLAGS = -ldl +CONFIGURE_ENV = +BUILD_ENV = + include gar/category.mk Added: csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch =================================================================== --- csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch (rev 0) +++ csw/mgar/pkg/unrealircd/trunk/files/0001-Remove-inline-as-it-confuses-the-compiler.patch 2011-05-11 11:20:15 UTC (rev 14558) @@ -0,0 +1,62 @@ +From 4950c61a325c468aa31c6bc75377ad2ece76bfef Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 11 May 2011 12:41:05 +0200 +Subject: [PATCH] Remove 'inline' as it confuses the compiler + +--- + src/modules.c | 4 ++-- + src/packet.c | 2 +- + src/parse.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/modules.c b/src/modules.c +index 4d4e6c9..62e5190 100644 +--- a/src/modules.c ++++ b/src/modules.c +@@ -946,7 +946,7 @@ void module_loadall(int module_load) + #endif + } + +-inline int Module_IsAlreadyChild(Module *parent, Module *child) ++int Module_IsAlreadyChild(Module *parent, Module *child) + { + ModuleChild *mcp; + +@@ -958,7 +958,7 @@ inline int Module_IsAlreadyChild(Module *parent, Module *child) + return 0; + } + +-inline void Module_AddAsChild(Module *parent, Module *child) ++void Module_AddAsChild(Module *parent, Module *child) + { + ModuleChild *childp = NULL; + +diff --git a/src/packet.c b/src/packet.c +index fa64d9a..8e4f9c9 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -304,7 +304,7 @@ void add_CommandX(char *name, char *token, int (*func)(), unsigned char param + cmd->friend = NULL; + } + +-inline aCommand *find_CommandEx(char *cmd, int (*func)(), int token) ++aCommand *find_CommandEx(char *cmd, int (*func)(), int token) + { + aCommand *p; + +diff --git a/src/parse.c b/src/parse.c +index 25f03a2..790341b 100644 +--- a/src/parse.c ++++ b/src/parse.c +@@ -156,7 +156,7 @@ void ban_flooder(aClient *cptr) + /* + * This routine adds fake lag if needed. + */ +-inline void parse_addlag(aClient *cptr, int cmdbytes) ++void parse_addlag(aClient *cptr, int cmdbytes) + { + if (!IsServer(cptr) && !IsNoFakeLag(cptr) && + #ifdef FAKELAG_CONFIGURABLE +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Wed May 11 16:54:28 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 11 May 2011 16:54:28 +0200 Subject: [csw-devel] SF.net SVN: gar:[14557] csw/mgar/pkg/file/trunk In-Reply-To: References: Message-ID: <849F2F1E-575A-4031-BF0A-D663969D167A@opencsw.org> Hi Maciej, Am 11.05.2011 um 11:06 schrieb wahwah at users.sourceforge.net: > Revision: 14557 > http://gar.svn.sourceforge.net/gar/?rev=14557&view=rev > Author: wahwah > Date: 2011-05-11 09:06:23 +0000 (Wed, 11 May 2011) > > Log Message: > ----------- > pkg/file/trunk: Upgrade to 5.07 > > Modified Paths: > -------------- > csw/mgar/pkg/file/trunk/Makefile > csw/mgar/pkg/file/trunk/checksums > > Modified: csw/mgar/pkg/file/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/file/trunk/Makefile 2011-05-10 14:29:29 UTC (rev 14556) > +++ csw/mgar/pkg/file/trunk/Makefile 2011-05-11 09:06:23 UTC (rev 14557) > @@ -1,7 +1,7 @@ > # $Id$ > > NAME = file > -VERSION = 5.05 > +VERSION = 5.07 > CATEGORIES = utils > > define BLURB > @@ -29,7 +29,7 @@ > PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch > PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch > > -NOISAEXEC = 1 > +ISAEXEC = 0 This is already the default. I suggest taking the line out completely for cleanlyness. Best regards -- Dago > > PACKAGES += CSWgfile > PKGFILES_CSWgfile += $(bindir)/gfile > > Modified: csw/mgar/pkg/file/trunk/checksums > =================================================================== > --- csw/mgar/pkg/file/trunk/checksums 2011-05-10 14:29:29 UTC (rev 14556) > +++ csw/mgar/pkg/file/trunk/checksums 2011-05-11 09:06:23 UTC (rev 14557) > @@ -1 +1 @@ > -0b429063710457be2bd17a18389cb018 file-5.05.tar.gz > +b8d1f9a8a644067bd0a703cebf3f4858 file-5.07.tar.gz > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From wahwah at users.sourceforge.net Wed May 11 17:01:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 May 2011 15:01:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14559] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 14559 http://gar.svn.sourceforge.net/gar/?rev=14559&view=rev Author: wahwah Date: 2011-05-11 15:01:14 +0000 (Wed, 11 May 2011) Log Message: ----------- pkg/file/trunk: refactor to use the default ISAEXEC setting Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2011-05-11 11:20:15 UTC (rev 14558) +++ csw/mgar/pkg/file/trunk/Makefile 2011-05-11 15:01:14 UTC (rev 14559) @@ -29,8 +29,6 @@ PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch -ISAEXEC = 0 - PACKAGES += CSWgfile PKGFILES_CSWgfile += $(bindir)/gfile PKGFILES_CSWgfile += $(bindir)/$(ISA_DEFAULT64)/gfile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 12 15:07:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 May 2011 13:07:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14560] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 14560 http://gar.svn.sourceforge.net/gar/?rev=14560&view=rev Author: dmichelsen Date: 2011-05-12 13:07:40 +0000 (Thu, 12 May 2011) Log Message: ----------- readline: Clarify description of devel package Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-05-11 15:01:14 UTC (rev 14559) +++ csw/mgar/pkg/readline/trunk/Makefile 2011-05-12 13:07:40 UTC (rev 14560) @@ -48,7 +48,7 @@ PACKAGES += CSWlibreadline-dev CATALOGNAME_CSWlibreadline-dev = libreadline_dev -SPKG_DESC_CSWlibreadline-dev = GNU readline development files +SPKG_DESC_CSWlibreadline-dev = GNU readline development files for libreadline.so.6 and libhistory.so.6 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibhistory6 RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibreadline6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 12 15:24:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 May 2011 13:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14561] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14561 http://gar.svn.sourceforge.net/gar/?rev=14561&view=rev Author: dmichelsen Date: 2011-05-12 13:24:46 +0000 (Thu, 12 May 2011) Log Message: ----------- mGAR v2: Fix description of obsoleted packages... again! Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-05-12 13:07:40 UTC (rev 14560) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-05-12 13:24:46 UTC (rev 14561) @@ -67,7 +67,7 @@ CATALOGNAME_$(1) ?= $(subst -,_,$(patsubst CSW%,%,$(1)))_stub # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). -SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,96) . " ..."/e') +SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,0,96) . " ..."/e') RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) PKGFILES_$(1) = NOFILES ARCHALL_$(1) = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 12 15:42:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 May 2011 13:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14562] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14562 http://gar.svn.sourceforge.net/gar/?rev=14562&view=rev Author: dmichelsen Date: 2011-05-12 13:42:18 +0000 (Thu, 12 May 2011) Log Message: ----------- mGAR v2: Fix contents of obsolete when packages are foreign Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-05-12 13:24:46 UTC (rev 14561) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-05-12 13:42:18 UTC (rev 14562) @@ -727,10 +727,12 @@ merge-obsolete: $(WORKDIR_GLOBAL) $(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),($(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \ - $(if $(SPKG_DESC_$Q), \ - echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ - echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | perl -npe 's/^\S*\s//;s/\s+/ /')"; \ - )))) > $(WORKDIR_GLOBAL)/$P.obsolete; \ + $(if $(filter $Q,$(FOREIGN_PACKAGES)), \ + echo "$Q";, \ + $(if $(SPKG_DESC_$Q), \ + echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \ + echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | perl -npe 's/^\S*\s//;s/\s+/ /')"; \ + ))))) > $(WORKDIR_GLOBAL)/$P.obsolete; \ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 11:07:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 09:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14563] csw/mgar/pkg/libntlm/trunk/Makefile Message-ID: Revision: 14563 http://gar.svn.sourceforge.net/gar/?rev=14563&view=rev Author: dmichelsen Date: 2011-05-13 09:07:53 +0000 (Fri, 13 May 2011) Log Message: ----------- libntlm: Split off devel package, rename library package and update to new defaults Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/Makefile Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2011-05-12 13:42:18 UTC (rev 14562) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2011-05-13 09:07:53 UTC (rev 14563) @@ -14,17 +14,21 @@ MASTER_SITES = http://josefsson.org/libntlm/releases/ DISTFILES = $(DISTNAME).tar.gz -# 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://josefsson.org/libntlm/ -SPKG_SOURCEURL = http://josefsson.org/libntlm/ +PACKAGES += CSWlibntlm0 +SPKG_DESC_CSWlibntlm0 = Microsoft WinNT domain authentication library, libntlm.so.0 +PKGFILES_CSWlibntlm0 = $(call pkgfiles_lib,libntlm.so.0) +OBSOLETED_BY_CSWlibntlm0 = CSWlibntlm +PACKAGES += CSWlibntlm-dev +SPKG_DESC_CSWlibntlm-dev = Development files for libntlm.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibntlm-dev += CSWlibntlm0 + # We don't need it and if defined the test breaks LD_OPTIONS = BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Fri May 13 11:45:13 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Fri, 13 May 2011 09:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14564] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 14564 http://gar.svn.sourceforge.net/gar/?rev=14564&view=rev Author: aigoshin Date: 2011-05-13 09:45:12 +0000 (Fri, 13 May 2011) Log Message: ----------- nginx: release 20110513 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-13 09:07:53 UTC (rev 14563) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-13 09:45:12 UTC (rev 14564) @@ -74,12 +74,10 @@ CONFIGURE_ARGS += --with-http_ssl_module CONFIGURE_ARGS += --with-http_stub_status_module -#CHECKPKG_OVERRIDES_CSWnginx += bad-location-of-file|file=/var/run/nginx - TEST_SCRIPTS = INITSMF = $(sysconfdir)/init.d/cswnginx -PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html +PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html $(localstatedir)/nginx/html/index.html NGINXDOCS = CHANGES CHANGES.ru LICENSE README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 12:55:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 10:55:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14565] csw/mgar/pkg/libspf2/trunk/Makefile Message-ID: Revision: 14565 http://gar.svn.sourceforge.net/gar/?rev=14565&view=rev Author: dmichelsen Date: 2011-05-13 10:55:08 +0000 (Fri, 13 May 2011) Log Message: ----------- libspf2: Split packages and update to new defaults Modified Paths: -------------- csw/mgar/pkg/libspf2/trunk/Makefile Modified: csw/mgar/pkg/libspf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspf2/trunk/Makefile 2011-05-13 09:45:12 UTC (rev 14564) +++ csw/mgar/pkg/libspf2/trunk/Makefile 2011-05-13 10:55:08 UTC (rev 14565) @@ -12,23 +12,37 @@ endef MASTER_SITES = http://www.libspf2.org/spf/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# 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.libspf2.org -SPKG_SOURCEURL = http://www.libspf2.org +LICENSE = LICENSES -RUNTIME_DEP_PKGS = CSWggettextrt +PACKAGES += CSWlibspf2-2 +SPKG_DESC_CSWlibspf2-2 = Library that implements Sender Policy Framework, libspf2.so.2 +PKGFILES_CSWlibspf2-2 = $(call pkgfiles_lib,libspf2.so.2) +RUNTIME_DEP_PKGS_CSWlibspf2-2 += CSWlibintl8 +OBSOLETED_BY_CSWlibspf2-2 = CSWlibspf2 +PACKAGES += CSWlibspf2-utils +SPKG_DESC_CSWlibspf2-utils = Utility programs to query SPF +PKGFILES_CSWlibspf2-utils = $(bindir)/.* +RUNTIME_DEP_PKGS_CSWlibspf2-utils += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibspf2-utils += CSWlibspf2-2 +OBSOLETED_BY_CSWlibspf2-utils = CSWlibspf2 + +PACKAGES += CSWlibspf2-dev +SPKG_DESC_CSWlibspf2-dev = Development files for libspf2.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibspf2-dev = CSWlibspf2-2 + BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) EXTRA_LINKER_FLAGS = -lresolv -lsocket -lnsl -TEST_TARGET = check +# These are the same as the ones without '_static', but linked statically +# against libspf2.a +# I guess nobody needs that as we always depend on the library package anyway +EXTRA_MERGE_EXCLUDE_FILES = $(bindir)/.*_static -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 13:11:22 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 11:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14566] csw/mgar/pkg/gnuplot/trunk Message-ID: Revision: 14566 http://gar.svn.sourceforge.net/gar/?rev=14566&view=rev Author: dmichelsen Date: 2011-05-13 11:11:22 +0000 (Fri, 13 May 2011) Log Message: ----------- gnuplot: Update to 4.4.3, new dependency names, corrected font pathes Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile csw/mgar/pkg/gnuplot/trunk/checksums Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-13 10:55:08 UTC (rev 14565) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-13 11:11:22 UTC (rev 14566) @@ -1,5 +1,5 @@ NAME = gnuplot -VERSION = 4.4.2 +VERSION = 4.4.3 CATEGORIES = utils DESCRIPTION = The Gnuplot Plotting Utility @@ -12,9 +12,6 @@ PATCHFILES = 0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch -# 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.gnuplot.info/ LICENSE = Copyright @@ -27,7 +24,7 @@ RUNTIME_DEP_PKGS_CSWgnuplot += CSWfconfig RUNTIME_DEP_PKGS_CSWgnuplot += CSWiconv RUNTIME_DEP_PKGS_CSWgnuplot += CSWreadline -RUNTIME_DEP_PKGS_CSWgnuplot += CSWgd +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibgd2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWxpm RUNTIME_DEP_PKGS_CSWgnuplot += CSWncurses RUNTIME_DEP_PKGS_CSWgnuplot += CSWlua @@ -42,7 +39,7 @@ RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpng RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWfconfig RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo @@ -50,7 +47,7 @@ RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWreadline RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWgtk2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWgd +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgd2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWxpm RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWncurses RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlua @@ -62,6 +59,8 @@ BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot-wx) +EXTRA_LINKER_FLAGS = -norunpath + EXTRA_MODULATORS = WXWIDGETS MODULATIONS_WXWIDGETS = yes no @@ -69,6 +68,7 @@ CONFIGURE_ARGS_wxwidgets-no += --without-cairo CONFIGURE_ARGS_wxwidgets-no += --disable-wxwidgets +CONFIGURE_ARGS_wxwidgets-no += --without-x CONFIGURE_ARGS += $(CONFIGURE_ARGS_wxwidgets-$(WXWIDGETS)) # Preset value until this is fixed: @@ -79,8 +79,6 @@ EXTRA_TEST_EXPORTS = DISPLAY DISPLAY = -TEST_TARGET = check - MERGE_SCRIPTS_isa-default-wxwidgets-yes = copy-all MERGE_SCRIPTS_isa-default-wxwidgets-no = copy-all @@ -109,4 +107,24 @@ CHECKPKG_OVERRIDES_CSWgnuplot += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives +# These are just examples +CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.4/gnuplot.gih-nowx +CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.4/gnuplot.gih-wx +CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnuplot.info + +# Is this GDFONTPATH related? That would be bad... CHECK!!! +#CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-nowx +#CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-wx +#CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/share|root/opt/csw/bin/gnuplot-nowx +#CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/share|root/opt/csw/bin/gnuplot-wx + include gar/category.mk + +# Adjust font pathes. /usr/sfw is just the last resort for a font, it could have been ommitted. +post-extract-modulated: + perl -pi \ + -e 's,/usr/X11R6/lib/X11/fonts/Type1,/usr/openwin/lib/X11/fonts/Type1,;' \ + -e 's,/usr/X11R6/lib/X11/fonts/truetype,/usr/openwin/lib/X11/fonts/TrueType,;' \ + -e 's,/usr/share/ghostscript/fonts,/opt/csw/share/ghostscript/fonts,;' \ + -e 's,/usr/local/share/ghostscript/fonts,/usr/sfw/share/ghostscript/fonts,;' \ + $(WORKSRC)/src/variable.c Modified: csw/mgar/pkg/gnuplot/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuplot/trunk/checksums 2011-05-13 10:55:08 UTC (rev 14565) +++ csw/mgar/pkg/gnuplot/trunk/checksums 2011-05-13 11:11:22 UTC (rev 14566) @@ -1 +1 @@ -a4f0dd89f9b9334890464f687ddd9f50 gnuplot-4.4.2.tar.gz +639603752996f4923bc02c895fa03b45 gnuplot-4.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 13:14:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 11:14:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14567] csw/mgar/pkg/pakchois/trunk Message-ID: Revision: 14567 http://gar.svn.sourceforge.net/gar/?rev=14567&view=rev Author: dmichelsen Date: 2011-05-13 11:14:13 +0000 (Fri, 13 May 2011) Log Message: ----------- pakchois: Split packages and update to new defaults Modified Paths: -------------- csw/mgar/pkg/pakchois/trunk/Makefile csw/mgar/pkg/pakchois/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pakchois/trunk/files/COPYING Modified: csw/mgar/pkg/pakchois/trunk/Makefile =================================================================== --- csw/mgar/pkg/pakchois/trunk/Makefile 2011-05-13 11:11:22 UTC (rev 14566) +++ csw/mgar/pkg/pakchois/trunk/Makefile 2011-05-13 11:14:13 UTC (rev 14567) @@ -9,18 +9,24 @@ endef MASTER_SITES = http://www.manyfish.co.uk/pakchois/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING -# 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.manyfish.co.uk/pakchois/ -SPKG_SOURCEURL = http://www.manyfish.co.uk/pakchois/ +PACKAGES += CSWlibpakchois0 +SPKG_DESC_CSWlibpakchois0 = Just another PKCS \#11 wrapper library, libpakchois.so.0 +PKGFILES_CSWlibpakchois0 = $(call pkgfiles_lib,libpakchois.so.0) +RUNTIME_DEP_PKGS_CSWlibpakchois0 += CSWlibintl8 +OBSOLETED_BY_CSWlibpakchois0 = CSWpakchois +PACKAGES += CSWlibpakchois-dev +SPKG_DESC_CSWlibpakchois-dev = Development files for libpakchois.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibpakchois-dev = CSWlibpakchois0 + BUILD64 = 1 NOISALIST = 1 EXTRA_LINKER_FLAGS = -lintl -CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS = CSWggettextrt - include gar/category.mk Modified: csw/mgar/pkg/pakchois/trunk/checksums =================================================================== --- csw/mgar/pkg/pakchois/trunk/checksums 2011-05-13 11:11:22 UTC (rev 14566) +++ csw/mgar/pkg/pakchois/trunk/checksums 2011-05-13 11:14:13 UTC (rev 14567) @@ -1 +1 @@ -218ad0256e514989299acdf4e86aaf3d download/pakchois-0.4.tar.gz +218ad0256e514989299acdf4e86aaf3d pakchois-0.4.tar.gz Added: csw/mgar/pkg/pakchois/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/pakchois/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/pakchois/trunk/files/COPYING 2011-05-13 11:14:13 UTC (rev 14567) @@ -0,0 +1,38 @@ +/* + pakchois PKCS#11 interface + Copyright (C) 2008, Joe Orton + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA + +*/ + +/* + This interface is directly derived from the scute.org PKCS#11 + cryptoki interface, which is: + + Copyright 2006, 2007 g10 Code GmbH + Copyright 2006 Andreas Jellinghaus + + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. +*/ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 13:46:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 11:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14568] csw/mgar/pkg/wavpack/trunk/Makefile Message-ID: Revision: 14568 http://gar.svn.sourceforge.net/gar/?rev=14568&view=rev Author: dmichelsen Date: 2011-05-13 11:46:42 +0000 (Fri, 13 May 2011) Log Message: ----------- wavpack: Split packages and update to new defaults Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2011-05-13 11:14:13 UTC (rev 14567) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2011-05-13 11:46:42 UTC (rev 14568) @@ -12,21 +12,26 @@ endef MASTER_SITES = http://www.wavpack.com/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +LICENSE = license.txt -RUNTIME_DEP_PKGS = CSWiconv +PACKAGES += CSWlibwavpack1 +SPKG_DESC_CSWlibwavpack1 = Open audio compression format library, libwavpack.so.1 +PKGFILES_CSWlibwavpack1 = $(call pkgfiles_lib,libwavpack.so.1) +RUNTIME_DEP_PKGS_CSWlibwavpack1 += CSWiconv -LICENSE = license.txt +PACKAGES += CSWwavpack +SPKG_DESC_CSWwavpack = Wavpack audio compression format tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWwavpack += CSWiconv +RUNTIME_DEP_PKGS_CSWwavpack += CSWlibwavpack1 +PACKAGES += CSWlibwavpack-dev +SPKG_DESC_CSWlibwavpack-dev = Development files for libwavpack.so.1 +PKGFILES_CSWlibwavpack-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibwavpack-dev = CSWlibwavpack1 + BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 14:26:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 12:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14569] csw/mgar/pkg/pth/tags/pth-2.0.7, REV=2009.02.05/ Message-ID: Revision: 14569 http://gar.svn.sourceforge.net/gar/?rev=14569&view=rev Author: dmichelsen Date: 2011-05-13 12:26:09 +0000 (Fri, 13 May 2011) Log Message: ----------- pth: Snapshot existing build for Solaris 8 Added Paths: ----------- csw/mgar/pkg/pth/tags/pth-2.0.7,REV=2009.02.05/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 14:30:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 12:30:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14570] csw/mgar/pkg/pth/trunk Message-ID: Revision: 14570 http://gar.svn.sourceforge.net/gar/?rev=14570&view=rev Author: dmichelsen Date: 2011-05-13 12:30:54 +0000 (Fri, 13 May 2011) Log Message: ----------- pth: Split packages and remove old Solaris 8 stuff Modified Paths: -------------- csw/mgar/pkg/pth/trunk/Makefile csw/mgar/pkg/pth/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pth/trunk/files/CSWpth.gspec Modified: csw/mgar/pkg/pth/trunk/Makefile =================================================================== --- csw/mgar/pkg/pth/trunk/Makefile 2011-05-13 12:26:09 UTC (rev 14569) +++ csw/mgar/pkg/pth/trunk/Makefile 2011-05-13 12:30:54 UTC (rev 14570) @@ -10,33 +10,26 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWpth,) +DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://www.gnu.org/software/pth/ +# Patch PTH.H to increase FD_SETSIZE for 64bit builds +PATCHFILES = patch_pth_fdsetsize64.diff -# 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.gnu.org/software/pth/ -## Patch PTH.H to increase FD_SETSIZE for 64bit builds -PATCHFILES = patch_pth_fdsetsize64.diff +PACKAGES += CSWlibpth20 +SPKG_DESC_CSWlibpth20 = GNU Pth portable threads +PKGFILES_CSWlibpth20 = $(call pkgfiles_lib,libpth.so.20) +OBSOLETED_BY_CSWlibpth20 = CSWpth +PACKAGES += CSWlibpth-dev +SPKG_DESC_CSWlibpth-dev = Development files for libpth.so.20 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibpth-dev = CSWlibpth20 + BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +# This is an example of 'configure' +CHECKPKG_OVERRIDES_CSWlibpth-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/pth.3 -# Add static libs as under Solaris 7/8 x86 shared libpth doesn't work correctly. -MERGE_EXCLUDE_STATICLIBS = - include gar/category.mk - -# No shared libraries on Solaris 7/8 x86: -# http://www.mail-archive.com/pth-users at gnu.org/msg00113.html -# and (from ChangeLog) -# *) Make --disable-shared the default under Solaris-2.[78]/x86, because -# it is known to segfault sporadically if Pth is built as a DSO. As -# traces showed, it is not a Pth problem, but it looks like a problem with -# the dynamic linker on Solaris/x86. The same Solaris versions on SPARC -# don't have this problem. -# [Ralf S. Engelschall] Modified: csw/mgar/pkg/pth/trunk/checksums =================================================================== --- csw/mgar/pkg/pth/trunk/checksums 2011-05-13 12:26:09 UTC (rev 14569) +++ csw/mgar/pkg/pth/trunk/checksums 2011-05-13 12:30:54 UTC (rev 14570) @@ -1,3 +1 @@ -9cb4a25331a4c4db866a31cbe507c793 download/pth-2.0.7.tar.gz -0969fbb8ae032c8c1a08ff1c839a8c1c download/CSWpth.gspec -58bbe7bfde0cf264c073b5a3d5d3845f download/patch_pth_fdsetsize64.diff +9cb4a25331a4c4db866a31cbe507c793 pth-2.0.7.tar.gz Deleted: csw/mgar/pkg/pth/trunk/files/CSWpth.gspec =================================================================== --- csw/mgar/pkg/pth/trunk/files/CSWpth.gspec 2011-05-13 12:26:09 UTC (rev 14569) +++ csw/mgar/pkg/pth/trunk/files/CSWpth.gspec 2011-05-13 12:30:54 UTC (rev 14570) @@ -1,4 +0,0 @@ -%var bitname pth -%var pkgname CSWpth -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 15:26:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 13:26:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14571] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 14571 http://gar.svn.sourceforge.net/gar/?rev=14571&view=rev Author: dmichelsen Date: 2011-05-13 13:26:28 +0000 (Fri, 13 May 2011) Log Message: ----------- lzlib: Fix build of 1.1 and split packages Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-05-13 12:30:54 UTC (rev 14570) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-05-13 13:26:28 UTC (rev 14571) @@ -14,13 +14,20 @@ PATCHFILES = 0001-gcc-to-sunstudio.patch PATCHFILES += 0002-gcc-to-sunstudio-2.patch -# 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.nongnu.org/lzip/lzlib.html +PACKAGES += CSWliblz1 +SPKG_DESC_CSWliblz1 = A lossless data compression library based on the LZMA algorithm, liblz.so.1 +PKGFILES_CSWliblz1 = $(call pkgfiles_lib,liblz.so.1) +OBSOLETED_BY_CSWliblz1 = CSWlzlib + +PACKAGES += CSWliblz-dev +SPKG_DESC_CSWliblz-dev = Development files for liblz.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWliblz-dev = CSWliblz1 + EXTRA_CXXFLAGS = -xcode=pic32 -EXTRA_LINKER_FLAGS = -lCrun +EXTRA_LINKER_FLAGS = -lCrun -norunpath BUILD64 = 1 NOISALIST = 1 @@ -31,10 +38,10 @@ CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" -TEST_TARGET = check - -INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VARS = INSTALL LDCONFIG INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall +# This is close to a NOP +INSTALL_OVERRIDE_VAR_LDCONFIG = echo include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 13 16:18:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 May 2011 14:18:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14572] csw/mgar/pkg/gnuplot/trunk/Makefile Message-ID: Revision: 14572 http://gar.svn.sourceforge.net/gar/?rev=14572&view=rev Author: dmichelsen Date: 2011-05-13 14:18:23 +0000 (Fri, 13 May 2011) Log Message: ----------- gnuplot: Update dependencies and remove libexec file as it is no longer built when disabling X11 Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-13 13:26:28 UTC (rev 14571) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-13 14:18:23 UTC (rev 14572) @@ -31,6 +31,10 @@ RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgnuplot += CSWpango +RUNTIME_DEP_PKGS_CSWgnuplot += CSWglib2 PACKAGES += CSWgnuplot-wx CATALOGNAME_CSWgnuplot-wx = gnuplot_wx @@ -84,7 +88,6 @@ # These are exactly the differing files between the install-directories ALTERNATIVE_FILES += /opt/csw/bin/gnuplot -ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.4/gnuplot_x11 ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot-gui.elc ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot.elc ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.4/gnuplot.gih This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat May 14 00:30:22 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 May 2011 22:30:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14573] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 14573 http://gar.svn.sourceforge.net/gar/?rev=14573&view=rev Author: bonivart Date: 2011-05-13 22:30:22 +0000 (Fri, 13 May 2011) Log Message: ----------- pkgutil: beta 3 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-05-13 14:18:23 UTC (rev 14572) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-05-13 22:30:22 UTC (rev 14573) @@ -2,7 +2,7 @@ # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar NAME = pkgutil -VERSION = 2.4b2 +VERSION = 2.4b3 GARVERSION = $(VERSION) CATEGORIES = utils Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-13 14:18:23 UTC (rev 14572) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-13 22:30:22 UTC (rev 14573) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -ce6064a86016e22d93d65077abd14bc2 pkgutil-2.4b2.zip +427ac6ab1ed1f9c2803d091fd90ecb93 pkgutil-2.4b3.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 14 14:14:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 May 2011 12:14:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14574] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14574 http://gar.svn.sourceforge.net/gar/?rev=14574&view=rev Author: bdwalton Date: 2011-05-14 12:14:21 +0000 (Sat, 14 May 2011) Log Message: ----------- bacula/trunk: add additional obsoletions Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-13 22:30:22 UTC (rev 14573) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-14 12:14:21 UTC (rev 14574) @@ -44,6 +44,7 @@ CATALOGNAME_CSWbacula-console = bacula_console SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console +OBSOLETED_BY_CSWbacula-console = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-console += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-console += CSWncurses @@ -61,13 +62,15 @@ ARCHALL_CSWbacula-client = 1 RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES -OBSOLETED_BY_CSWbacula-client = CSWbaculaclient CSWbaculagnome -SPKG_DESC_CSWbaculagnome = Obsolete bacula gnome console -CATALOGNAME_CSWbaculagnome = bacula_gnome_stub +OBSOLETED_BY_CSWbacula-client = CSWbaculaclient +CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd + # set this explicitly to help phil's tools for now CATALOGNAME_CSWbaculaclient = bacula_client_stub -CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd +SPKG_DESC_CSWbaculagnome = Obsolete bacula gnome console +CATALOGNAME_CSWbaculagnome = bacula_gnome_stub + CATALOGNAME_CSWbacula-doc = bacula_doc SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* @@ -78,6 +81,7 @@ CATALOGNAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor +OBSOLETED_BY_CSWbacula-tray-monitor = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4corert This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 14 14:18:55 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 May 2011 12:18:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[14575] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14575 http://gar.svn.sourceforge.net/gar/?rev=14575&view=rev Author: bdwalton Date: 2011-05-14 12:18:55 +0000 (Sat, 14 May 2011) Log Message: ----------- bacula/trunk: client package still obsoletes old gnome package too Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-14 12:14:21 UTC (rev 14574) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-14 12:18:55 UTC (rev 14575) @@ -62,7 +62,7 @@ ARCHALL_CSWbacula-client = 1 RUNTIME_DEP_PKGS_CSWbacula-client += CSWbacula-fd PKGFILES_CSWbacula-client = NOFILES -OBSOLETED_BY_CSWbacula-client = CSWbaculaclient +OBSOLETED_BY_CSWbacula-client = CSWbaculaclient CSWbaculagnome CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd # set this explicitly to help phil's tools for now This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat May 14 14:23:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 May 2011 12:23:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14576] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14576 http://gar.svn.sourceforge.net/gar/?rev=14576&view=rev Author: bdwalton Date: 2011-05-14 12:23:08 +0000 (Sat, 14 May 2011) Log Message: ----------- bacula/trunk: override storage daemon dep on mtx. needed by mtx-changer script Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-14 12:18:55 UTC (rev 14575) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-14 12:23:08 UTC (rev 14576) @@ -162,6 +162,7 @@ PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup PKGFILES_CSWbacula-sd += /etc/opt/csw/pkg/CSWbacula-sd/services +CHECKPKG_OVERRIDES_CSWbacula-sd += surplus-dependency|CSWmtx CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 14 22:17:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 May 2011 20:17:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14577] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 14577 http://gar.svn.sourceforge.net/gar/?rev=14577&view=rev Author: wahwah Date: 2011-05-14 20:17:48 +0000 (Sat, 14 May 2011) Log Message: ----------- submitpkg: Add a teaser for csw-upload-pkg Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-05-14 12:23:08 UTC (rev 14576) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-05-14 20:17:48 UTC (rev 14577) @@ -103,7 +103,26 @@ logging.error(msg) raise PackageSubmissionError(msg) +def DisplayCswUploadPkgTeaser(files_to_rsync): + if not files_to_rsync: + print "No files have been processed." + return + print + print "Please try the new package upload tool." + print "It will upload your packages to the opencsw-future catalog." + print "http://mirror.opencsw.org/opencsw-future/" + print "Once uploaded, your packages will be available in a couple hours." + print "To upload, run the following command:" + print + script_path = os.path.join( + os.path.dirname(sys.argv[0]), + "csw-upload-pkg") + print "%s \\" % script_path + for f in files_to_rsync[:-1]: + print " %s \\" % f + print " %s" % files_to_rsync[-1] + def main(): try: config = ConfigParser.SafeConfigParser() @@ -246,6 +265,7 @@ print "Your e-mail hasn't been sent yet!" print "Issue the following command to have it sent:" print "sendmail -t < %s" % DEFAULT_FILE_NAME + DisplayCswUploadPkgTeaser(files_to_rsync) if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 15 12:05:17 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 15 May 2011 10:05:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14578] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 14578 http://gar.svn.sourceforge.net/gar/?rev=14578&view=rev Author: bonivart Date: 2011-05-15 10:05:17 +0000 (Sun, 15 May 2011) Log Message: ----------- pkgutil: 2.4 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-05-14 20:17:48 UTC (rev 14577) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-05-15 10:05:17 UTC (rev 14578) @@ -2,7 +2,7 @@ # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar NAME = pkgutil -VERSION = 2.4b3 +VERSION = 2.4 GARVERSION = $(VERSION) CATEGORIES = utils Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-14 20:17:48 UTC (rev 14577) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-15 10:05:17 UTC (rev 14578) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -427ac6ab1ed1f9c2803d091fd90ecb93 pkgutil-2.4b3.zip +bd789a4b56e564494594bcb112115477 pkgutil-2.4.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 15 12:15:47 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 15 May 2011 10:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14579] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 14579 http://gar.svn.sourceforge.net/gar/?rev=14579&view=rev Author: bonivart Date: 2011-05-15 10:15:47 +0000 (Sun, 15 May 2011) Log Message: ----------- pkgutil: update source Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-15 10:05:17 UTC (rev 14578) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-05-15 10:15:47 UTC (rev 14579) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -bd789a4b56e564494594bcb112115477 pkgutil-2.4.zip +e87b64770282e68713692dce6e0808c3 pkgutil-2.4.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 15 15:12:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 May 2011 13:12:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14580] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14580 http://gar.svn.sourceforge.net/gar/?rev=14580&view=rev Author: bdwalton Date: 2011-05-15 13:12:13 +0000 (Sun, 15 May 2011) Log Message: ----------- cswutils/trunk: version bump and inclusion of csw-upload-pkg symlink Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-15 10:15:47 UTC (rev 14579) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-15 13:12:13 UTC (rev 14580) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.16 +VERSION = 1.17 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -88,4 +88,6 @@ $(DESTDIR)$(bindir)/comparepkg @ln -s ../lib/python/csw/submit_to_newpkgs.py \ $(DESTDIR)$(bindir)/submitpkg + @ln -s ../lib/python/csw/csw_upload_pkg.py \ + $(DESTDIR)$(bindir)/csw-upload-pkg @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 15 15:46:57 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 May 2011 13:46:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14581] csw/mgar/pkg/apache2/branches/open-bug-squash Message-ID: Revision: 14581 http://gar.svn.sourceforge.net/gar/?rev=14581&view=rev Author: bdwalton Date: 2011-05-15 13:46:56 +0000 (Sun, 15 May 2011) Log Message: ----------- apache2/branches/open-bug-squash: a cleanup before merging back to trunk Modified Paths: -------------- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile Removed Paths: ------------- csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-05-15 13:12:13 UTC (rev 14580) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-05-15 13:46:56 UTC (rev 14581) @@ -225,8 +225,6 @@ #PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' -#include checkpkg.mak - include gar/category.mk CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak =================================================================== --- csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak 2011-05-15 13:12:13 UTC (rev 14580) +++ csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak 2011-05-15 13:46:56 UTC (rev 14581) @@ -1,365 +0,0 @@ -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/etc/opt/csw/init.d/cswapache2|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-autoindex.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-dav.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-default.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-languages.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-mpm.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-multilang-errordoc.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-ssl.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-userdir.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-vhosts.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/httpd.conf.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/magic.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/mime.types.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-autoindex.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-dav.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-default.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-info.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-languages.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-manual.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-mpm.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-multilang-errordoc.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-ssl.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-userdir.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/extra/httpd-vhosts.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/original/httpd.conf|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_actions.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_alias.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_asis.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_auth_basic.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_auth_digest.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_alias.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_anon.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_dbd.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_dbm.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_default.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authn_file.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authnz_ldap.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_dbm.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_default.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_groupfile.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_host.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_owner.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_authz_user.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_autoindex.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_bucketeer.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_cache.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_cern_meta.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_cgi.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_cgid.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_charset_lite.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dav.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dav_fs.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dav_lock.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dbd.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_deflate.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dir.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_disk_cache.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_dumpio.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_env.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_expires.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_ext_filter.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_file_cache.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_filter.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_headers.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_ident.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_imagemap.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_include.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_info.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_ldap.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_log_config.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_log_forensic.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_logio.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_mem_cache.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_mime.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_mime_magic.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_negotiation.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy_ajp.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy_balancer.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy_connect.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy_ftp.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_proxy_http.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_rewrite.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_setenvif.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_speling.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_ssl.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_status.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_unique_id.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_userdir.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_usertrack.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_version.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/libexec/mod_vhost_alias.so|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man1/dbmmanage.1|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man1/htdbm.1|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man1/htdigest.1|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man1/htpasswd.1|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/ab.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/apachectl.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/htcacheclean.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/httpd.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/logresolve.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/man/man8/rotatelogs.8|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/ab|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/apachectl|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/checkgid|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/dbmmanage|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/envvars-std|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/envvars|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/htcacheclean|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/htdbm|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/htdigest|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/htpasswd|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/httxt2dbm|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/logresolve|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/rotatelogs|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/sbin/update20to22|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/cgi-bin/printenv|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/cgi-bin/test-cgi|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_BAD_GATEWAY.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_BAD_REQUEST.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_FORBIDDEN.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_GONE.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_INTERNAL_SERVER_ERROR.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_LENGTH_REQUIRED.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_METHOD_NOT_ALLOWED.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_NOT_FOUND.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_NOT_IMPLEMENTED.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_PRECONDITION_FAILED.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_REQUEST_TIME_OUT.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_REQUEST_URI_TOO_LARGE.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_SERVICE_UNAVAILABLE.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_UNAUTHORIZED.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/HTTP_VARIANT_ALSO_VARIES.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/README|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/error/contact.html.var|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/htdocs/index.html.CSW|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/README.html|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/README|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/a.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/a.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/alert.black.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/alert.black.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/alert.red.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/alert.red.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/apache_pb.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/apache_pb.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/apache_pb2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/apache_pb2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/apache_pb2_ani.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/back.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/back.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ball.gray.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ball.gray.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ball.red.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ball.red.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/binary.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/binary.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/binhex.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/binhex.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/blank.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/blank.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/bomb.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/bomb.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/box1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/box1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/box2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/box2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/broken.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/broken.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/burst.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/burst.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/c.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/c.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/comp.blue.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/comp.blue.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/comp.gray.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/comp.gray.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/compressed.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/compressed.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/continued.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/continued.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/dir.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/dir.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/diskimg.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/diskimg.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/down.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/down.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/dvi.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/dvi.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/f.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/f.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.open.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.open.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.sec.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/folder.sec.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/forward.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/forward.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.red.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.red.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.sec.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/generic.sec.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/hand.right.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/hand.right.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/hand.up.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/hand.up.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/icon.sheet.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/icon.sheet.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image3.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/image3.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/index.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/index.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/layout.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/layout.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/left.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/left.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/link.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/link.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/movie.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/movie.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/p.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/p.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/patch.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/patch.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pdf.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pdf.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie0.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie0.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie3.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie3.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie4.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie4.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie5.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/tar.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie5.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie6.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie6.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie7.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie7.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie8.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/pie8.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/portal.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/portal.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ps.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/ps.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/quill.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/quill.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/right.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/right.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/screw1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/screw1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/screw2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/screw2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/script.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/script.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/back.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/back.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/binary.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/binary.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/binhex.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/binhex.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/blank.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/blank.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/broken.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/broken.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/burst.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/burst.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/comp1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/comp1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/comp2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/comp2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/compressed.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/compressed.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/continued.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/continued.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/dir.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/dir.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/dir2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/dir2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/doc.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/doc.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/forward.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/forward.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic3.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/generic3.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/image.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/image2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/image2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/index.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/index.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/key.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/key.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/movie.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/movie.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/patch.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/patch.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/ps.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/ps.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/rainbow.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/rainbow.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/sound.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/sound.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/sound2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/sound2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/tar.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/tar.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/text.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/text.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/transfer.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/transfer.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/unknown.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/unknown.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/uu.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/uu.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/image.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/small/uu.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sound1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sound1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sound2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sound2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sphere1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sphere1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sphere2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/sphere2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/tar.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/tex.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/tex.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/text.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/text.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/transfer.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/transfer.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/unknown.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/unknown.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/up.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/up.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/uu.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/uu.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/uuencoded.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/uuencoded.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/world1.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/world1.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/world2.gif|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/share/icons/world2.png|CSWapache2|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2-devel += file-collision|/opt/csw/apache2/share/error/include/bottom.html|CSWapache2-devel|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2-devel += file-collision|/opt/csw/apache2/share/error/include/spacer.html|CSWapache2-devel|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2-devel += file-collision|/opt/csw/apache2/share/error/include/top.html|CSWapache2-devel|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 15 16:47:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 May 2011 14:47:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14582] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 14582 http://gar.svn.sourceforge.net/gar/?rev=14582&view=rev Author: bdwalton Date: 2011-05-15 14:47:06 +0000 (Sun, 15 May 2011) Log Message: ----------- apache2/trunk: a manual merge (read: rsync -a --delete --exclude .svn) of the open-bug-squash branch Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 csw/mgar/pkg/apache2/trunk/files/config.layout csw/mgar/pkg/apache2/trunk/files/cswapache2 Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch csw/mgar/pkg/apache2/trunk/files/0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch csw/mgar/pkg/apache2/trunk/files/0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postremove csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preinstall csw/mgar/pkg/apache2/trunk/files/CSWapache2-dev.cswreleasenotes csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall csw/mgar/pkg/apache2/trunk/files/i.cswap2mod csw/mgar/pkg/apache2/trunk/files/r.cswap2mod Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preremove csw/mgar/pkg/apache2/trunk/files/build_cas_template csw/mgar/pkg/apache2/trunk/files/index_cas_template csw/mgar/pkg/apache2/trunk/files/ssl_cas_template Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-05-15 14:47:06 UTC (rev 14582) @@ -37,29 +37,39 @@ # Standard package bits DISTFILES += CSWapache2.killproc cswapache2 -DISTFILES += CSWapache2.preinstall -DISTFILES += CSWap2worker.postinstall CSWap2worker.preremove +DISTFILES += CSWapache2.preinstall CSWapache2.postinstall +DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove +DISTFILES += CSWap2worker.preinstall +DISTFILES += CSWapache2-dev.cswreleasenotes + # Configuration templates DISTFILES += update20to22 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt +PATCHFILES += 0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch +PATCHFILES += 0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch +PATCHFILES += 0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch + UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec +PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec PACKAGES += CSWap2worker # These packages are dummy versions to make dependencies nicer -# as various things depend on CSWap2prefork currently -PACKAGES += CSWap2prefork CSWapache2rt +# as various things depend on them currently +PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c +OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel + ARCHALL_CSWapache2-manual = 1 ARCHALL_CSWap2prefork = 1 ARCHALL_CSWapache2rt = 1 +ARCHALL_CSWapache2c = 1 CATALOGNAME_CSWapache2 = apache2 -CATALOGNAME_CSWapache2-devel = apache2_devel +CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual CATALOGNAME_CSWap2suexec = ap2_suexec CATALOGNAME_CSWap2prefork = ap2_prefork @@ -67,32 +77,44 @@ CATALOGNAME_CSWapache2rt = apache2rt SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. -SPKG_DESC_CSWapache2-devel = The development files for Apache2. +SPKG_DESC_CSWapache2-dev = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. SPKG_DESC_CSWap2worker = The apache worker mpm. SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. +SPKG_DESC_CSWapache2c = A stub for the old apache2c package. -INCOMPATIBLE_PKGS_CSWapache2 = CSWapache2c - RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-devel = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat -RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv +RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork +RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv CSWapache2c RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h + +# these will eventually go away... +CHECKPKG_OVERRIDES_CSWap2suexec += catalogname-does-not-match-pkgname|pkgname=CSWap2suexec|catalogname=ap2_suexec|expected-catalogname=ap2suexec +CHECKPKG_OVERRIDES_CSWap2worker += catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker +CHECKPKG_OVERRIDES_CSWap2prefork += catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork + + # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -162,6 +184,7 @@ CONFIGURE_ARGS += --with-suexec-gidmin=100 CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec +CONFIGURE_ARGS += --with-suexec-safepath=/opt/csw/bin:/usr/bin:/bin CONFIGURE_ARGS += --enable-authn-alias CONFIGURE_ARGS += --enable-authnz-ldap CONFIGURE_ARGS += --enable-file-cache @@ -192,14 +215,15 @@ STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWap2suexec += .*ap2mod.*suexec -PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la) +PKGFILES_CSWap2suexec += .*ap2mod/suexec +PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* +PKGFILES_CSWapache2c = .*share/doc/apache2c.* -PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/opt\/csw\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /ssl_cert_migration.CSW/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /index.html.CSW/ {$$$$1 = "e"; $$$$2 = "build"}; {print}' +#PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' include gar/category.mk @@ -209,12 +233,14 @@ FIXCONFIG_RMPATHS = $(DESTDIR) pre-configure-modulated: + (cd $(WORKDIR)/$(NAME)-$(VERSION); ./buildconf) @gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \ $(WORKDIR)/config.layout > $(WORKDIR)/$(NAME)-$(VERSION)/config.layout @$(MAKECOOKIE) -post-install-modulated: rename-httpd copy-local-files copy-readmes +post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes + copy-readmes: @(cd $(WORKDIR); for f in README.CSW*; do \ p=`echo $$f | sed 's/README.CSW.//'`; \ @@ -236,20 +262,56 @@ @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin @$(MAKECOOKIE) +# Create stock templates +template_list = share/htdocs/index.html +template_list += etc/extra/httpd-autoindex.conf +template_list += etc/extra/httpd-dav.conf +template_list += etc/extra/httpd-default.conf +template_list += etc/extra/httpd-info.conf +template_list += etc/extra/httpd-languages.conf +template_list += etc/extra/httpd-multilang-errordoc.conf +template_list += etc/extra/httpd-userdir.conf +template_list += etc/extra/httpd-vhosts.conf +template_list += etc/extra/httpd-mpm.conf +template_list += etc/magic +template_list += etc/mime.types + create-templates: + @echo " => Creating template files" + @( cd $(DESTDIR)$(prefix)/apache2 ; \ + for file in $(template_list) ; do \ + gmv -v $$file $$file.CSW ; \ + done ) @$(MAKECOOKIE) -post-merge: create-templates - @echo " => Creating template files and CAS shell scripts..." - @( cd $(PKGROOT)/etc/opt/csw/apache2/; \ - for f in *conf extra/* mime* magic*; do \ - echo "...$$f"; \ - mv $$f $$f.CSW; \ - $(abspath $(FILEDIR))/build_cas_template $$f > $$f; \ - done; \ - cd $(PKGROOT)/opt/csw/apache2/share/htdocs; \ - rm index.html; \ - cp $(abspath $(FILEDIR))/index_cas_template index.html.CSW; \ - cp $(abspath $(FILEDIR))/ssl_cas_template ssl_cert_migration.CSW ) +post-merge: + @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ + for f in httpd.conf extra/httpd-ssl.conf; do \ + perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ + s/Group.*daemon.*/Group \@GROUP\@/; \ + s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \ + s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ + s/^(LoadModule.*suexec.*)/#$$1/; \ + s/^#(Include.*httpd-mpm.conf)/$$1/; \ + s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ + mv $$f $$f.CSW; \ + done ) + @echo Fixing usr/local references in the online manaual... + @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ + /opt/csw/bin/gfind . -type f -print0 | \ + /opt/csw/bin/gxargs -0 \ + perl -pi \ + -e 's@/usr/local/apache2*@/opt/csw/apache2 at g;' \ + -e 's@/usr/local@/opt/csw/apache2 at g') + @echo Fixing export/home references in the online manaual... + @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ + /opt/csw/bin/gfind . -type f -print0 | \ + /opt/csw/bin/gxargs -0 \ + perl -pi \ + -e 's@/export/home@/home at g;') + @echo Fixing usr/local reference in the cgi-bin scripts + @(cd $(PKGROOT)/$(prefix)/apache2/share/cgi-bin; \ + perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *) @$(MAKECOOKIE) + Added: csw/mgar/pkg/apache2/trunk/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch =================================================================== --- csw/mgar/pkg/apache2/trunk/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,33 @@ +From 386d1e486af82bffc18f4668a96565b892b1ae48 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 20 Jan 2011 02:16:26 +0100 +Subject: [PATCH] Apply a large hammer to buildconf to fix libtool setup + +The heuristics used in buildconf are broken with our newest version of +the libtool stack. For now, apply an ugly hack to the script to make +it work. Later, we'll polish it and make it general enough to submit +upstream. + +Signed-off-by: Ben Walton +--- + srclib/apr/buildconf | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/srclib/apr/buildconf b/srclib/apr/buildconf +index 1041af4..f84e205 100755 +--- a/srclib/apr/buildconf ++++ b/srclib/apr/buildconf +@@ -52,8 +52,8 @@ if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 + elif grep all_pkgmacro_files $libtoolize > /dev/null; then + # libtool 2.x +- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` +- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` ++ aclocal_dir=/opt/csw/share/aclocal ++ ltfiles=`sed -n '/all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` + for f in $ltfiles; do + test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build + done +-- +1.7.3.2 + Added: csw/mgar/pkg/apache2/trunk/files/0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch =================================================================== --- csw/mgar/pkg/apache2/trunk/files/0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,54 @@ +From c1d63dce36cee499600cc4bf4a4856ec35c7a942 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 22 Feb 2011 10:12:00 +0100 +Subject: [PATCH] Adjust a few /usr/local paths in the man pages. + +Signed-off-by: Ben Walton +--- + docs/man/htdbm.1 | 2 +- + docs/man/htpasswd.1 | 2 +- + docs/man/httpd.8 | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1 +index d37be2c..80334f0 100644 +--- a/docs/man/htdbm.1 ++++ b/docs/man/htdbm.1 +@@ -123,7 +123,7 @@ htdbm returns a zero status ("true") if the username and password have been succ + + .nf + +- htdbm /usr/local/etc/apache/\&.htdbm-users jsmith ++ htdbm /opt/csw/apache2/etc/\&.htdbm-users jsmith + + .fi + +diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 +index 40858a0..1d669a1 100644 +--- a/docs/man/htpasswd.1 ++++ b/docs/man/htpasswd.1 +@@ -100,7 +100,7 @@ htpasswd returns a zero status ("true") if the username and password have been s + + .nf + +- htpasswd /usr/local/etc/apache/\&.htpasswd-users jsmith ++ htpasswd /opt/csw/apache2/etc/\&.htpasswd-users jsmith + + .fi + +diff --git a/docs/man/httpd.8 b/docs/man/httpd.8 +index 5b9e168..d806ebe 100644 +--- a/docs/man/httpd.8 ++++ b/docs/man/httpd.8 +@@ -50,7 +50,7 @@ In general, httpd should not be invoked directly, but rather should be invoked v + + .TP + -d \fIserverroot\fR +-Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&. The default is /usr/local/apache2\&. ++Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&. The default is /opt/csw/apache2\&. + .TP + -f \fIconfig\fR + Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&. +-- +1.7.3.2 + Added: csw/mgar/pkg/apache2/trunk/files/0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch =================================================================== --- csw/mgar/pkg/apache2/trunk/files/0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,29 @@ +From 4565f79569130fc4ec0bae99fd3829785394f937 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 28 Feb 2011 01:23:44 +0100 +Subject: [PATCH] Switch usr/local for opt/csw in default cgi path + +Modify the default PATH for cgi scripts to use /opt/csw/bin as the +final element instead of /usr/local/bin. + +Signed-off-by: Ben Walton +--- + include/httpd.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/httpd.h b/include/httpd.h +index 40351b7..0fff717 100644 +--- a/include/httpd.h ++++ b/include/httpd.h +@@ -150,7 +150,7 @@ extern "C" { + + /** The default path for CGI scripts if none is currently set */ + #ifndef DEFAULT_PATH +-#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin" ++#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/opt/csw/bin" + #endif + + /** The path to the suExec wrapper, can be overridden in Configuration */ +-- +1.7.3.2 + Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall 2011-05-15 14:47:06 UTC (rev 14582) @@ -1,52 +1,41 @@ #!/bin/sh -# this is a special handler for the worker mpm of apache2. As we ship -# the init/smf script with the primary package (which provides the -# default prefork mpm), there is no hook to auto-(re)start apache when -# this package gets installed. Unfortunately, the postinstall script -# is the best way to handle this situation. + # Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi -CSW_PREFIX=/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_HTTPD=$AP2_BINDIR/httpd -AP2_CTRL=$AP2_BINDIR/apachectl -AP2_CONF=/etc/opt/csw/apache2/httpd.conf -SVCADM=/usr/sbin/svcadm +# Determine if service should be started or not +daemon=yes +if [ "$autoenable_daemons" = "no" ]; then + daemon=no +fi -# only worry about stop/start if we're not installing via jumpstart or -# similar -if [ -z "$PKG_INSTALL_ROOT" ]; then - [ ! -f "$AP2_CONF" ] && exit 0 +if [ "$autoenable_cswapache2" = "no" ]; then - # Source csw.conf, if it exists - if [ -f /opt/csw/etc/csw.conf ] ; then - . /opt/csw/etc/csw.conf - fi - if [ -f /etc/opt/csw/csw.conf ] ; then - . /etc/opt/csw/csw.conf - fi - + daemon=no +elif [ "$autoenable_cswapache2" = "yes" ]; then daemon=yes - if [ "$autoenable_daemons" = "no" ]; then - daemon=no +fi + +if [ "$daemon" = "yes" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi fi - if [ "$autoenable_cswapache2" = "no" ]; then - daemon=no - elif [ "$autoenable_cswapache2" = "yes" ]; then - daemon=yes - fi - if [ "$daemon" = "yes" -a -x "$AP2_HTTPD" ]; then - if [ -x "$SVCADM" ]; then - $SVCADM disable cswapache2 - $SVCADM enable cswapache2 - elif [ -x "$AP2_CTRL" ]; then - $AP2_CTRL -k stop - $AP2_CTRL -k start - fi - sleep 2 + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart fi fi - -exit 0 Added: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postremove =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postremove (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postremove 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,30 @@ +#!/bin/sh + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +# On removal of the worker mpm, restart apache to use the prefork (default) +# mpm...only if it's currently running though +if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then + # Determine if SMF should be used or not + smf=no + + if [ "$use_smf" = "no" ]; then + smf=no + else + if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then + smf=yes + fi + fi + + if [ "$smf" = "yes" ]; then + svcadm restart cswapache2 + else + /etc/init.d/cswapache2 restart + fi +fi Added: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preinstall (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preinstall 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,15 @@ +#!/bin/sh + +# The old apache2 packages could potentially leave a dangling +# sbin/httpd file. As this would prevent successful delivery of the +# new packages (alternatives won't instantiate sbin/httpd as a symlink +# since it exists already), we need to kill sbin/httpd if it exists +# when CSWapache2 is installed. + +HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd + +if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then + rm -f "$HTTPD" +fi + +exit 0 Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preremove =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preremove 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.preremove 2011-05-15 14:47:06 UTC (rev 14582) @@ -1,26 +0,0 @@ -#!/bin/sh - -# Stop httpd.worker prior to removal - -CSW_PREFIX=/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_HTTPD=$AP2_BINDIR/httpd -AP2_CTRL=$AP2_BINDIR/apachectl -AP2_CONF=/etc/opt/csw/apache2/httpd.conf -SVCADM=/usr/sbin/svcadm - -[ ! -f "$AP2_CONF" ] && exit 0 - -if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then - if [ -x "$AP2_HTTPD" ]; then - if [ -x "$SVCADM" ]; then - $SVCADM disable cswapache2 - elif [ -x "$AP2_CTRL" ]; then - $AP2_CTRL -k stop - fi - sleep 2 - fi -fi - -exit 0 Added: csw/mgar/pkg/apache2/trunk/files/CSWapache2-dev.cswreleasenotes =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-dev.cswreleasenotes (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-dev.cswreleasenotes 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,3 @@ +* /usr/local references: + - include/httpd.h: specifies default if no HTTPD_ROOT set, overridden via + ap_config_auto.h Added: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,101 @@ +#!/bin/sh + +ROOT=${PKG_INSTALL_ROOT:-/} +CSW_PREFIX=${ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_RUNDIR=$AP2_PREFIX/var/run + + +UPGRADE_CONFIGS="\ + httpd.conf \ + ssl.conf \ + extra/httpd-ssl.conf \ + extra/httpd-mpm.conf \ + " +# Don't overwrite config if it exists +warn_update=0 +# For use in config files and certificate generation +hostname=`hostname` +echo "Checking configuration files:" +for file in $UPGRADE_CONFIGS; do + config=$AP2_CONFDIR/$file + if [ -f "$config" ]; then + if [ -n "`grep mod_auth.so $config`" ]; then + echo "Updating syntax of $config to Apache 2.2" + $AP2_BINDIR/update20to22 $config + warn_update=1 + fi + # Ensure that the PidFile is pointed at ServerRoot relative path. + perl -i -plne 's#PidFile /var#PidFile var#' + elif [ -f "$config.CSW" ]; then + echo "Creating $config from template" + sed -e s, at HOSTNAME@,$hostname,g \ + -e s, at USER@,nobody,g \ + -e s, at GROUP@,nobody,g \ + -e s, at ADMIN@,root@$hostname,g $config.CSW > $config + fi +done + +if [ $warn_update -eq 1 ] ; then +cat << EOF + +*** NOTICE: Existing configuration files have been updated to +*** Apache 2.2 syntax. Additional files can be updated using +*** /opt/csw/apache2/sbin/update20to22. + +EOF +fi + +# Copy templates +template_list="\ + share/htdocs/index.html \ + etc/extra/httpd-autoindex.conf \ + etc/extra/httpd-dav.conf \ + etc/extra/httpd-default.conf \ + etc/extra/httpd-info.conf \ + etc/extra/httpd-languages.conf \ + etc/extra/httpd-multilang-errordoc.conf \ + etc/extra/httpd-userdir.conf \ + etc/extra/httpd-vhosts.conf \ + etc/magic \ + etc/mime.types" + +echo Copying CSW templates: +for file in $template_list +do + filepath=$AP2_PREFIX/$file + if [ -f "$filepath" ]; then + echo " preserving $filepath" + elif [ -f "$filepath.CSW" ]; then + echo " creating $filepath" + cp $filepath.CSW $filepath + fi +done + +if [ ! -f $AP2_CONFDIR/server.crt -a ! -f $AP2_CONFDIR/server.key ]; then + echo Generating dummy ssl key and certificate... + # this is likely overkill for a dummy cert, but why not + umask 0077 + cat </dev/null 2>&1 +TS +Westfarthing +Hobbiton + + +$hostname +bilbo at example.net + + +EOF +fi + +if [ ! -d "$AP2_RUNDIR" ]; then + echo "Creating var/run..." + mkdir -p "$AP2_RUNDIR" +fi + +exit 0 Modified: csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/README.CSW.apache2 2011-05-15 14:47:06 UTC (rev 14582) @@ -3,8 +3,6 @@ Please note that recent changes may affect the way you're used to working with the CSW apache2 packages. -***************************************************** - In the past, CSWap2prefork and CSWap2worker delivered a specific mpm module for use with apache2. We now ship the prefork mpm as part of CSWapache2 while the worker mpm remains in CSWap2worker. @@ -16,23 +14,5 @@ /opt/csw/sbin/alternatives --help for information on how you can do this. - -***************************************************** - -We are also moving configuration of apache from /opt/csw/apache2/etc -to /etc/opt/csw/apache2. The files should be auto-migrated upon -upgrade but if you've broken from the standard config file layout, -you'll need to manually copy in those additional files. Sorry for the -hassle, but this really needs to be done for a package like apache -where the configuration will be unique on most machines. - -***************************************************** - -The default log directory is now /var/opt/csw/log/apache2. Old logs -are not touched and the configuration will honour the old location. You -should updated this and move the logs manually. - -***************************************************** - Thanks -The OpenCSW apache2 team. Deleted: csw/mgar/pkg/apache2/trunk/files/build_cas_template =================================================================== --- csw/mgar/pkg/apache2/trunk/files/build_cas_template 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/build_cas_template 2011-05-15 14:47:06 UTC (rev 14582) @@ -1,52 +0,0 @@ -#!/bin/bash - -cat <&2 - elif [ -f "\$OLD_CONF_FILE" ]; then - # migrate old config, ensure it's updated - echo "Importing old config file from \$OLD_CONF_FILE." >&2 - cp -p \$OLD_CONF_FILE \$NEW_CONF_FILE - if [ -n "\`grep mod_auth.so \$NEW_CONF_FILE\`" ]; then - echo "Updating the syntax to 2.2 format though..." >&2 - \${PIR}/\$AP2_DIR/sbin/update20to22 \$NEW_CONF_FILE >&2 - fi - - # handle the new path to default ssl key files. - # update various uses of the var/ paths. - # ensure we use the config files from the new location - perl -pi -e "s/\/opt\/csw\/apache2\/etc\/server.crt/\/etc\/opt\/csw\/apache2\/server.crt/;" -e "s/\/opt\/csw\/apache2\/etc\/server.key/\/etc\/opt\/csw\/apache2\/server.key/;" -e "s/\/opt\/csw\/apache2\/var\/log\//\/var\/opt\/csw\/log\/apache2\//;" -e "s/\"\/opt\/csw\/apache2\/var\//\"\/var\/opt\/csw\/apache2\//;" -e "s/\"var\/log\//\"\/var\/opt\/csw\/log\/apache2\//;" -e "s/ etc\// \/etc\/opt\/csw\/apache2\//;" \$NEW_CONF_FILE - else - # so, we're not an existing or 'needs migration' install, we must - # install from the templates. - echo "Installing $1 from CSW template." >&2 - cp -p \$NEW_CONF_FILE.CSW \$NEW_CONF_FILE - perl -pi \ - -e "s/#*ServerName.*www.example.com/ServerName \`hostname\`/;" \ - -e "s/#*ServerAdmin you\@example.com/ServerAdmin root\@\`hostname\`/;" \ - -e "s/^User.*daemon/User nobody/;" \ - -e "s/^Group.*daemon/Group nobody/;" \ - -e 's/^(LoadModule.*suexec.*)/#\$1/;' \ - -e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$NEW_CONF_FILE - - chown root:bin \$NEW_CONF_FILE - chmod 644 \$NEW_CONF_FILE - fi -else - echo "Not removing $1." >&2 - # preserve ourselves with no changes - cat \$NEW_CONF_FILE -fi -EOF Modified: csw/mgar/pkg/apache2/trunk/files/config.layout =================================================================== --- csw/mgar/pkg/apache2/trunk/files/config.layout 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/config.layout 2011-05-15 14:47:06 UTC (rev 14582) @@ -7,7 +7,7 @@ libdir: ${exec_prefix}/lib libexecdir: ${exec_prefix}/libexec mandir: ${exec_prefix}/man - sysconfdir: /etc/${prefix} + sysconfdir: ${exec_prefix}/etc datadir: ${prefix}/share installbuilddir: ${datadir}/build errordir: ${datadir}/error @@ -16,8 +16,8 @@ manualdir: ${datadir}/manual cgidir: ${datadir}/cgi-bin includedir: ${exec_prefix}/include - localstatedir: /var/opt/csw/apache2 + localstatedir: ${prefix}/var runtimedir: /var/run - logfiledir: /var/opt/csw/log/apache2 + logfiledir: ${localstatedir}/log proxycachedir: ${datadir}/proxy Modified: csw/mgar/pkg/apache2/trunk/files/cswapache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/cswapache2 2011-05-15 13:46:56 UTC (rev 14581) +++ csw/mgar/pkg/apache2/trunk/files/cswapache2 2011-05-15 14:47:06 UTC (rev 14582) @@ -12,9 +12,9 @@ #RC_SLEV 3 #FMRI network -CONF_FILE=/etc/opt/csw/apache2/httpd.conf -APACHECTL=/opt/csw/apache2/sbin/apachectl -SERVERCRT=/etc/opt/csw/apache2/server.crt +APACHE_HOME=/opt/csw/apache2 +CONF_FILE=$APACHE_HOME/etc/httpd.conf +APACHECTL=$APACHE_HOME/sbin/apachectl [ ! -f "$CONF_FILE" ] && exit 0 [ ! -x "$APACHECTL" ] && exit 0 @@ -22,7 +22,7 @@ case "$1" in start) cmd=$1 - if [ -f "$SERVERCRT" ]; then + if [ -f "$APACHE_HOME/etc/server.crt" ]; then cmd="$cmd -DSSL" fi ;; Added: csw/mgar/pkg/apache2/trunk/files/i.cswap2mod =================================================================== --- csw/mgar/pkg/apache2/trunk/files/i.cswap2mod (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/i.cswap2mod 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,79 @@ +#!/bin/sh +# +# i.cswap2mod - Class action script for installing apache2 modules +# +# Written by Ben Walton +# +# 2010-09-29 First Release +# + +# Source csw.conf, if it exists +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi + +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_CONFIG=$AP2_CONFDIR/httpd.conf +AP2_APXS=$AP2_BINDIR/apxs + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} + +while read src dest; do + # Place the file first + /usr/bin/cp -p $src $dest || exit 2 + echo $dest + + CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG + APXS=$PKG_INSTALL_ROOT/$AP2_APXS + MODFILE=`basename $dest` + MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` + + # Modules will be enabled by default, but a global kill switch + # is checked , followed by a module specific value. Thus, + # either ap2_enable_modules or ap2_enable_suexec (for example) + # could disable activation of the suexec module. The + # + # This value is passed to apxs (-a: add, enable; -A: add, + # disable) + enmod=-a + + if [ "$ap2_enable_modules" = "no" ]; then + enmod=-A + fi + + eval ap2_mod_specific="\$ap2_enable_$MODNAME" + if [ "$ap2_mod_specific" = "no" ]; then + enmod=-A + elif [ "$ap2_mod_specific" = "yes" ]; then + enmod=-a + fi + + if [ -f "$CONF" -a -x "$APXS" ]; then + # Add the module module, optionally enabling it by default + chroot $PKG_INSTALL_ROOT \ + $APXS -e $enmod -n $MODNAME $MODFILE + conftouched=1 + fi +done + +if [ "$conftouched" = "1" ]; then + cat <&2 - echo "

It works!

" > ${INDEX_HTML} - fi - - # create our 'template' version of the file regardless of normal version - echo "

It works!

" -fi Added: csw/mgar/pkg/apache2/trunk/files/r.cswap2mod =================================================================== --- csw/mgar/pkg/apache2/trunk/files/r.cswap2mod (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/r.cswap2mod 2011-05-15 14:47:06 UTC (rev 14582) @@ -0,0 +1,50 @@ +#!/bin/sh +# +# r.cswap2mod - Class action script for removing apache2 modules +# +# Written by Ben Walton +# +# 2010-09-29 First Release +# + +AP2_PREFIX=/opt/csw/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_CONFIG=$AP2_CONFDIR/httpd.conf +AP2_APXS=$AP2_BINDIR/apxs + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} + +while read dest; do + echo $dest + + CONF=$PKG_INSTALL_ROOT/$AP2_CONFIG + APXS=$PKG_INSTALL_ROOT/$AP2_APXS + MODFILE=`basename $dest` + MODNAME=`echo $MODFILE | sed 's/mod_//; s/\.so$//'` + + if [ -f "$CONF" -a -x "$APXS" ]; then + # Disable the module + chroot $PKG_INSTALL_ROOT \ + $APXS -e -A -n $MODNAME $MODFILE + conftouched=1 + fi + + # Now actually remove the file. + /usr/bin/rm -f $dest || exit 2 +done + +if [ "$conftouched" = "1" ]; then + cat <&2 - elif [ -f "$OLD_CERT_FILE" ]; then - # migrate old files. - echo "Importing old SSL files from /opt/csw/apache2/etc." >&2 - cp -p $OLD_CERT_FILE $NEW_CERT_FILE - cp -p $OLD_KEY_FILE $NEW_KEY_FILE - chown root:bin $NEW_CERT_FILE $NEW_KEY_FILE - else - echo Generating dummy ssl key and certificate... >&2 - # this is likely overkill for a dummy cert, but why not - cat </dev/null 2>&1 -TS -Westfarthing -Hobbiton - - -`hostname` -bilbo at example.net - - -EOF - chown root:bin $NEW_CERT_FILE $NEW_KEY_FILE - fi - cat < Revision: 14583 http://gar.svn.sourceforge.net/gar/?rev=14583&view=rev Author: dmichelsen Date: 2011-05-16 09:03:15 +0000 (Mon, 16 May 2011) Log Message: ----------- grep: Update to 2.8 and update to new defaults Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2011-05-15 14:47:06 UTC (rev 14582) +++ csw/mgar/pkg/grep/trunk/Makefile 2011-05-16 09:03:15 UTC (rev 14583) @@ -1,5 +1,5 @@ NAME = grep -VERSION = 2.7 +VERSION = 2.8 CATEGORIES = utils DESCRIPTION = GNU grep @@ -17,14 +17,12 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.xz - PACKAGES = CSWggrep CATALOGNAME = ggrep +RUNTIME_DEP_PKGS_CSWggrep += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWggrep += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWggrep += CSWiconv -DEP_PKGS = CSWggettextrt CSWiconv CSWpcrert - EXTRA_LINKER_FLAGS = -liconv CONFIGURE_ARGS = $(DIRPATHS) @@ -34,8 +32,6 @@ # https://savannah.gnu.org/bugs/?29380 SKIPTEST ?= 1 -TEST_TARGET = check - EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2011-05-15 14:47:06 UTC (rev 14582) +++ csw/mgar/pkg/grep/trunk/checksums 2011-05-16 09:03:15 UTC (rev 14583) @@ -1 +1 @@ -6dd9931a52501519d7779a27cf953326 grep-2.7.tar.xz +b59003c42b330bdabd417e00d07102da grep-2.8.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 16 14:54:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 May 2011 12:54:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14584] csw/mgar/pkg/bison/trunk Message-ID: Revision: 14584 http://gar.svn.sourceforge.net/gar/?rev=14584&view=rev Author: dmichelsen Date: 2011-05-16 12:54:36 +0000 (Mon, 16 May 2011) Log Message: ----------- bison: Update to 2.5 and new defaults Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/bison/trunk/checksums Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2011-05-16 09:03:15 UTC (rev 14583) +++ csw/mgar/pkg/bison/trunk/Makefile 2011-05-16 12:54:36 UTC (rev 14584) @@ -1,6 +1,5 @@ NAME = bison -# VERSION = 2.4.2.8-cb76 -VERSION = 2.4.3 +VERSION = 2.5 CATEGORIES = devel DESCRIPTION = GNU Project parser generator (yacc replacement) @@ -12,26 +11,23 @@ MASTER_SITES = $(GNU_MIRROR) # MASTER_SITES += http://alpha.gnu.org/gnu/bison/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -BUILD_DEP_PKGS = CSWgnulinks -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgm4 +RUNTIME_DEP_PKGS_CSWbison += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWbison += CSWiconv +RUNTIME_DEP_PKGS_CSWbison += CSWgm4 -SPKG_SOURCEURL = http://www.gnu.org/software/bison/ +VENDOR_URL = http://www.gnu.org/software/bison/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset\.alias # I guess we really need these CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWgm4 CHECKPKG_OVERRIDES_CSWbison += surplus-dependency|CSWiconv +# Skip tests as some fail due to problems in CSWlibgnugetopt includes +SKIPTEST ?= 1 + include gar/category.mk # Must use GNU grep during test @@ -41,4 +37,7 @@ mv $(DESTDIR)$(bindir)/yacc $(DESTDIR)$(bindir)/gyacc ginstall -d $(DESTDIR)$(prefix)/gnu ln -s ../bin/gyacc $(DESTDIR)$(prefix)/gnu/yacc + perl -pi \ + -e 's,/usr/local,$(prefix),g' \ + $(DESTDIR)$(infodir)/bison.info @$(MAKECOOKIE) Modified: csw/mgar/pkg/bison/trunk/checksums =================================================================== --- csw/mgar/pkg/bison/trunk/checksums 2011-05-16 09:03:15 UTC (rev 14583) +++ csw/mgar/pkg/bison/trunk/checksums 2011-05-16 12:54:36 UTC (rev 14584) @@ -1 +1 @@ -ea45c778b36bdc7a720096819e292a73 bison-2.4.3.tar.gz +687e1dcd29452789d34eaeea4c25abe4 bison-2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 17 00:04:58 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 May 2011 22:04:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14585] csw/mgar/pkg Message-ID: Revision: 14585 http://gar.svn.sourceforge.net/gar/?rev=14585&view=rev Author: wahwah Date: 2011-05-16 22:04:58 +0000 (Mon, 16 May 2011) Log Message: ----------- pkg/hyperion: Initial commit Added Paths: ----------- csw/mgar/pkg/hyperion/ csw/mgar/pkg/hyperion/Makefile csw/mgar/pkg/hyperion/branches/ csw/mgar/pkg/hyperion/tags/ csw/mgar/pkg/hyperion/trunk/ csw/mgar/pkg/hyperion/trunk/Makefile csw/mgar/pkg/hyperion/trunk/checksums csw/mgar/pkg/hyperion/trunk/files/ csw/mgar/pkg/hyperion/trunk/files/0001-Using-localstatedir-instead-of-prefix-var.patch csw/mgar/pkg/hyperion/trunk/files/gpl-1.0.txt Copied: csw/mgar/pkg/hyperion/Makefile (from rev 14576, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hyperion/Makefile (rev 0) +++ csw/mgar/pkg/hyperion/Makefile 2011-05-16 22:04:58 UTC (rev 14585) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/hyperion/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/hyperion/trunk/Makefile =================================================================== --- csw/mgar/pkg/hyperion/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hyperion/trunk/Makefile 2011-05-16 22:04:58 UTC (rev 14585) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = hyperion +VERSION = 1.0.2 +GARTYPE = v2 +CATEGORIES = apps + +SPKG_SOURCEURL = http://www.stack.nl/~jilles/irc/ +DESCRIPTION = Brief description +define BLURB +endef + +MASTER_SITES = http://www.stack.nl/~jilles/irc/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += gpl-1.0.txt + +LICENSE = gpl-1.0.txt + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-pedantic +CONFIGURE_ARGS += --disable-debug-syms + +RUNTIME_DEP_PKGS_CSWhyperion += CSWzlib +PATCHFILES += 0001-Using-localstatedir-instead-of-prefix-var.patch + +CHECKPKG_OVERRIDES_CSWhyperion += file-with-bad-content|/usr/local|root/etc/opt/csw/dancer-ircd/example.conf + +include gar/category.mk Property changes on: csw/mgar/pkg/hyperion/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/hyperion/trunk/checksums =================================================================== --- csw/mgar/pkg/hyperion/trunk/checksums (rev 0) +++ csw/mgar/pkg/hyperion/trunk/checksums 2011-05-16 22:04:58 UTC (rev 14585) @@ -0,0 +1 @@ +67d32285ef942bd462032a822e524c04 hyperion-1.0.2.tar.gz Added: csw/mgar/pkg/hyperion/trunk/files/0001-Using-localstatedir-instead-of-prefix-var.patch =================================================================== --- csw/mgar/pkg/hyperion/trunk/files/0001-Using-localstatedir-instead-of-prefix-var.patch (rev 0) +++ csw/mgar/pkg/hyperion/trunk/files/0001-Using-localstatedir-instead-of-prefix-var.patch 2011-05-16 22:04:58 UTC (rev 14585) @@ -0,0 +1,36 @@ +From 4e515cca8568d318d234235dc73f4a64663add96 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 16 May 2011 23:49:38 +0200 +Subject: [PATCH] Using localstatedir instead of prefix/var + +--- + Makefile.am | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 22c2226..29944ea 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -23,14 +23,14 @@ dist-hook: + (cd $(distdir)/include && cmp config.h.dist config.h || cp config.h.dist config.h) + + install-exec-hook: +- (${mkinstalldirs} ${DESTDIR}${prefix}/var/lib/dancer-ircd && \ +- cd ${DESTDIR}${prefix}/var/lib/dancer-ircd && \ ++ (${mkinstalldirs} ${DESTDIR}${localstatedir}/lib/dancer-ircd && \ ++ cd ${DESTDIR}${localstatedir}/lib/dancer-ircd && \ + ([ -f kline.conf ] || [ -L kline.conf ] || touch kline.conf) && \ + ([ -f dline.conf ] || [ -L dline.conf ] || touch dline.conf)) +- (${mkinstalldirs} ${DESTDIR}${prefix}/var/log/dancer-ircd && \ +- cd ${DESTDIR}${prefix}/var/log/dancer-ircd && \ ++ (${mkinstalldirs} ${DESTDIR}${localstatedir}/log/dancer-ircd && \ ++ cd ${DESTDIR}${localstatedir}/log/dancer-ircd && \ + ([ -f ircd.log ] || [ -L ircd.log ] || touch ircd.log)) +- ${mkinstalldirs} ${DESTDIR}${prefix}/var/run/dancer-ircd ++ ${mkinstalldirs} ${DESTDIR}${localstatedir}/run/dancer-ircd + + sign: + gpg --detach-sign $(distdir).tar.gz +-- +1.7.3.2 + Added: csw/mgar/pkg/hyperion/trunk/files/gpl-1.0.txt =================================================================== --- csw/mgar/pkg/hyperion/trunk/files/gpl-1.0.txt (rev 0) +++ csw/mgar/pkg/hyperion/trunk/files/gpl-1.0.txt 2011-05-16 22:04:58 UTC (rev 14585) @@ -0,0 +1,251 @@ + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 17 00:28:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 May 2011 22:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14586] csw/mgar/pkg/hyperion/trunk Message-ID: Revision: 14586 http://gar.svn.sourceforge.net/gar/?rev=14586&view=rev Author: wahwah Date: 2011-05-16 22:28:48 +0000 (Mon, 16 May 2011) Log Message: ----------- pkg/hyperion/trunk: Added a patch for paths.c Modified Paths: -------------- csw/mgar/pkg/hyperion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/hyperion/trunk/files/0002-Use-OpenCSW-paths.patch Modified: csw/mgar/pkg/hyperion/trunk/Makefile =================================================================== --- csw/mgar/pkg/hyperion/trunk/Makefile 2011-05-16 22:04:58 UTC (rev 14585) +++ csw/mgar/pkg/hyperion/trunk/Makefile 2011-05-16 22:28:48 UTC (rev 14586) @@ -23,6 +23,7 @@ RUNTIME_DEP_PKGS_CSWhyperion += CSWzlib PATCHFILES += 0001-Using-localstatedir-instead-of-prefix-var.patch +PATCHFILES += 0002-Use-OpenCSW-paths.patch CHECKPKG_OVERRIDES_CSWhyperion += file-with-bad-content|/usr/local|root/etc/opt/csw/dancer-ircd/example.conf Added: csw/mgar/pkg/hyperion/trunk/files/0002-Use-OpenCSW-paths.patch =================================================================== --- csw/mgar/pkg/hyperion/trunk/files/0002-Use-OpenCSW-paths.patch (rev 0) +++ csw/mgar/pkg/hyperion/trunk/files/0002-Use-OpenCSW-paths.patch 2011-05-16 22:28:48 UTC (rev 14586) @@ -0,0 +1,49 @@ +From 6e3349a385e42a81163e943c2e15e524c29003f7 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 17 May 2011 00:20:48 +0200 +Subject: [PATCH] Use OpenCSW paths + +--- + src/paths.c | 26 +++++++++++++------------- + 1 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/paths.c b/src/paths.c +index 8a84399..c8ac250 100644 +--- a/src/paths.c ++++ b/src/paths.c +@@ -65,19 +65,19 @@ + + #define DPATH PREFIX "/" + #define SPATH "sbin/hyperion-ircd" +-#define CPATH "etc/dancer-ircd/ircd.conf" +-#define MPATH "etc/dancer-ircd/motd" +-#define HPATH "etc/dancer-ircd/ohelp" +-#define OPATH "etc/dancer-ircd/omotd" +-#define LPATH "var/log/dancer-ircd/ircd.log" +-#define HLBASE "var/log/dancer-ircd/hash" +-#define USERLOG "var/log/dancer-ircd/user.log" +-#define OPERLOG "var/log/dancer-ircd/oper.log" +-#define PPATH "var/run/dancer-ircd/dancer-ircd.pid" +-#define KPATH "var/lib/dancer-ircd/kline.conf" +-#define DLPATH "var/lib/dancer-ircd/dline.conf" +-#define MXPATH "var/lib/dancer-ircd/ircd.max" +-#define DUMPPATH "var/lib/dancer-ircd/dump" ++#define CPATH "../../etc/opt/csw/dancer-ircd/ircd.conf" ++#define MPATH "../../etc/opt/csw/dancer-ircd/motd" ++#define HPATH "../../etc/opt/csw/dancer-ircd/ohelp" ++#define OPATH "../../etc/opt/csw/dancer-ircd/omotd" ++#define LPATH "../../var/opt/csw/log/dancer-ircd/ircd.log" ++#define HLBASE "../../var/opt/csw/log/dancer-ircd/hash" ++#define USERLOG "../../var/opt/csw/log/dancer-ircd/user.log" ++#define OPERLOG "../../var/opt/csw/log/dancer-ircd/oper.log" ++#define PPATH "../../var/opt/csw/run/dancer-ircd/dancer-ircd.pid" ++#define KPATH "../../var/opt/csw/lib/dancer-ircd/kline.conf" ++#define DLPATH "../../var/opt/csw/lib/dancer-ircd/dline.conf" ++#define MXPATH "../../var/opt/csw/lib/dancer-ircd/ircd.max" ++#define DUMPPATH "../../var/opt/csw/lib/dancer-ircd/dump" + + const char *work_dir = DPATH; + const char *config_file = CPATH; +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 17 10:22:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 May 2011 08:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14587] csw/mgar/gar/v2/lib/web Message-ID: Revision: 14587 http://gar.svn.sourceforge.net/gar/?rev=14587&view=rev Author: wahwah Date: 2011-05-17 08:22:46 +0000 (Tue, 17 May 2011) Log Message: ----------- pkgdb-web: Displaying package metadata Displaying the raw Python data structure, using pretty print (import pprint). It's a step towards easy package reviews on the web site. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-05-16 22:28:48 UTC (rev 14586) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-05-17 08:22:46 UTC (rev 14587) @@ -5,6 +5,7 @@ import web import sqlobject import json +import pprint from lib.python import models from lib.python import configuration from lib.python import pkgdb @@ -75,6 +76,7 @@ osrels = models.OsRelease.select() catrels = models.CatalogRelease.select() all_tags = list(models.CheckpkgErrorTag.selectBy(srv4_file=pkg)) + pkgstats_raw = pprint.pformat(pkg.GetStatsStruct()) if pkg.arch.name == 'all': archs = models.Architecture.select(models.Architecture.q.name!='all') else: @@ -88,7 +90,7 @@ tags_by_cat[key] = tags tags_and_catalogs.append((osrel, arch, catrel, tags)) return render.Srv4Detail(pkg, overrides, tags_by_cat, all_tags, - tags_and_catalogs) + tags_and_catalogs, pkgstats_raw) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-05-16 22:28:48 UTC (rev 14586) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-05-17 08:22:46 UTC (rev 14587) @@ -1,4 +1,4 @@ -$def with (pkg, overrides, tags_by_cat, tags, tags_and_catalogs) +$def with (pkg, overrides, tags_by_cat, tags, tags_and_catalogs, pkgstats_raw) @@ -84,5 +84,10 @@ </li> </ul> +<h3>Raw dump of the Python data structure</h3> +<pre> +$pkgstats_raw +</pre> + </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 17 14:29:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 May 2011 12:29:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14588] csw/mgar/pkg/liboggz/trunk Message-ID: <E1QMJP8-00082p-O6@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14588 http://gar.svn.sourceforge.net/gar/?rev=14588&view=rev Author: dmichelsen Date: 2011-05-17 12:29:38 +0000 (Tue, 17 May 2011) Log Message: ----------- liboggz: Update to 1.1.1, split packages and update to new standards Modified Paths: -------------- csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboggz/trunk/checksums csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch Removed Paths: ------------- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch Modified: csw/mgar/pkg/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile 2011-05-17 08:22:46 UTC (rev 14587) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2011-05-17 12:29:38 UTC (rev 14588) @@ -1,5 +1,5 @@ NAME = liboggz -VERSION = 1.1.0 +VERSION = 1.1.1 CATEGORIES = lib DESCRIPTION = A commandline tool for manipulating Ogg files @@ -14,27 +14,36 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/liboggz/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Remove-linker-version.patch -PATCHFILES += 0002-Add-getopt.h.patch -# 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.xiph.org/oggz/ BUILD_DEP_PKGS = CSWdoxygen -RUNTIME_DEP_PKGS = CSWlibogg +PACKAGES += CSWliboggz2 +SPKG_DESC_CSWliboggz2 = Ogg file manipulatin library, liboggz.so.2 +PKGFILES_CSWliboggz2 = $(call pkgfiles_lib,liboggz.so.2) +RUNTIME_DEP_PKGS_CSWliboggz2 += CSWlibogg0 + +PACKAGES += CSWliboggz-dev +SPKG_DESC_CSWliboggz-dev = Development files for liboggz.so.2 +PKGFILES_CSWliboggz-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWliboggz-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWliboggz-dev += CSWliboggz2 + +PACKAGES += CSWoggz +SPKG_DESC_CSWoggz = Commandline tools for manipulating Ogg files +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWoggz += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWoggz += CSWliboggz2 +OBSOLETED_BY_CSWoggz = CSWliboggz +CATALOGNAME_CSWliboggz = liboggz_stub + BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# This is just docs +CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/html/group__install.html +CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/latex/group__install.tex -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk - -# Solaris 10 does have getopt.h which interferes with the shipped one included first. -post-configure-isa-amd64: - rm -f $(WORKSRC)/include/getopt.h - @$(MAKECOOKIE) Modified: csw/mgar/pkg/liboggz/trunk/checksums =================================================================== --- csw/mgar/pkg/liboggz/trunk/checksums 2011-05-17 08:22:46 UTC (rev 14587) +++ csw/mgar/pkg/liboggz/trunk/checksums 2011-05-17 12:29:38 UTC (rev 14588) @@ -1,3 +1 @@ -2bcd76f053e973f82df1593400ca94fb 0001-Remove-linker-version.patch -008aac5337ca7e23490927baa4a38589 0002-Add-getopt.h.patch -f97f1d57820a9fc1d080409cf203b38a liboggz-1.1.0.tar.gz +3649a657f8e368b881ba8b1b57381ff7 liboggz-1.1.1.tar.gz Modified: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2011-05-17 08:22:46 UTC (rev 14587) +++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2011-05-17 12:29:38 UTC (rev 14588) @@ -1,23 +1,22 @@ -From 98520890bdf48d718490927f04197c48a1958647 Mon Sep 17 00:00:00 2001 -From: dam <dam at lcsw.(none)> -Date: Mon, 9 Nov 2009 03:55:19 +0100 +From ded5e4cdfd4ee2c3091f159db81425e4ae442ab7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <dam at opencsw.org> +Date: Tue, 17 May 2011 14:02:20 +0200 Subject: [PATCH] Remove linker version --- - configure | 8 -------- - configure.ac | 12 ------------ - 2 files changed, 0 insertions(+), 20 deletions(-) + configure | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 9342074..cafccae 100755 +index ae375d5..b28749d 100755 --- a/configure +++ b/configure -@@ -15629,14 +15629,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then +@@ -12747,14 +12747,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then fi -case "$target_os" in -- linux* | solaris*|k*bsd*-gnu*|gnu-*) +- linux* | solaris*|k*bsd*-gnu*|gnu*) - SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" - ;; - *) @@ -28,5 +27,5 @@ -- -1.6.3.2 +1.7.3.2 Deleted: csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch 2011-05-17 08:22:46 UTC (rev 14587) +++ csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch 2011-05-17 12:29:38 UTC (rev 14588) @@ -1,38 +0,0 @@ -From e404bd5d314bbd97a2d4579607679667bc4d099f Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen <dam at opencsw.org> -Date: Tue, 24 Nov 2009 22:12:30 +0100 -Subject: [PATCH] Add getopt.h - ---- - include/getopt.h | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - create mode 100644 include/getopt.h - -diff --git a/include/getopt.h b/include/getopt.h -new file mode 100644 -index 0000000..0e98fed ---- /dev/null -+++ b/include/getopt.h -@@ -0,0 +1,19 @@ -+/** -+ * @file getopt.h -+ * @ingroup wbxml2xml_tool -+ * @ingroup xml2wbxml_tool -+ * -+ * @author Kannel Team (http://www.kannel.org/) -+ * -+ * @brief getopt() implementation -+ */ -+ -+#ifndef WBXML_GETOPT_H -+#define WBXML_GETOPT_H -+ -+extern int opterr; -+extern int optind; -+extern int optopt; -+extern char *optarg; -+ -+#endif --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 17 14:49:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 May 2011 12:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14589] csw/mgar/pkg/libspectre/trunk Message-ID: <E1QMJip-0008Ph-BZ@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14589 http://gar.svn.sourceforge.net/gar/?rev=14589&view=rev Author: dmichelsen Date: 2011-05-17 12:49:59 +0000 (Tue, 17 May 2011) Log Message: ----------- libspectre: Split packages, remove fixes for reported upstream bugs Modified Paths: -------------- csw/mgar/pkg/libspectre/trunk/Makefile csw/mgar/pkg/libspectre/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libspectre/trunk/files/patch-stdint.diff Modified: csw/mgar/pkg/libspectre/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspectre/trunk/Makefile 2011-05-17 12:29:38 UTC (rev 14588) +++ csw/mgar/pkg/libspectre/trunk/Makefile 2011-05-17 12:49:59 UTC (rev 14589) @@ -7,29 +7,25 @@ endef MASTER_SITES = http://libspectre.freedesktop.org/releases/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# Use int_types.h instead of stdint.h until this is fixed: -# https://bugs.freedesktop.org/show_bug.cgi?id=27734 -PATCHFILES = patch-stdint.diff +VENDOR_URL = http://libspectre.freedesktop.org -SPKG_SOURCEURL = http://libspectre.freedesktop.org - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - DEP_PKGS = CSWgs -# The flags -pedantic gets selected during configure as it seems to cause -# no harm, but it effectively triggers performance tuning and fails as some -# files miss _mcount as the performance lib is not linked in. -# Do this until this bug is resolved: -# https://bugs.freedesktop.org/show_bug.cgi?id=27735 -BUILD_OVERRIDE_VARS = SPECTRE_CFLAGS -BUILD_OVERRIDE_VAR_SPECTRE_CFLAGS = +PACKAGES += CSWlibspectre1 +PKGFILES_CSWlibspectre1 += $(call pkgfiles_lib,libspectre.so.1) +SPKG_DESC_CSWlibspectre1 += A small library for rendering Postscript documents, libspectre.so.1 +RUNTIME_DEP_PKGS_CSWlibspectre += CSWlibspectre1 +OBSOLETED_BY_CSWlibspectre1 = CSWlibspectre +CATALOGNAME_CSWlibspectre = libspectre_stub +PACKAGES += CSWlibspectre-dev +SPKG_DESC_CSWlibspectre-dev = Development files for libspectre.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibspectre-dev = CSWlibspectre1 + # Disable for now as libgs is missing 64 bit #BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/libspectre/trunk/checksums =================================================================== --- csw/mgar/pkg/libspectre/trunk/checksums 2011-05-17 12:29:38 UTC (rev 14588) +++ csw/mgar/pkg/libspectre/trunk/checksums 2011-05-17 12:49:59 UTC (rev 14589) @@ -1,2 +1 @@ 5c6db35f2097c3a04c48c7f435d4b507 libspectre-0.2.6.tar.gz -7f3edd354885de75d806dfd740a23881 patch-stdint.diff Deleted: csw/mgar/pkg/libspectre/trunk/files/patch-stdint.diff =================================================================== --- csw/mgar/pkg/libspectre/trunk/files/patch-stdint.diff 2011-05-17 12:29:38 UTC (rev 14588) +++ csw/mgar/pkg/libspectre/trunk/files/patch-stdint.diff 2011-05-17 12:49:59 UTC (rev 14589) @@ -1,15 +0,0 @@ -diff -Naur libspectre-0.2.2.orig/libspectre/spectre-device.c libspectre-0.2.2.patched/libspectre/spectre-device.c ---- libspectre-0.2.2.orig/libspectre/spectre-device.c 2008-11-25 16:15:50.000000000 +0100 -+++ libspectre-0.2.2.patched/libspectre/spectre-device.c 2009-04-14 13:38:53.249669809 +0200 -@@ -21,7 +21,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifdef __sun -+#include <sys/int_types.h> -+#else - #include <stdint.h> -+#endif - - #include "spectre-device.h" - #include "spectre-gs.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue May 17 17:47:20 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 17 May 2011 15:47:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14590] csw/mgar/pkg/puppet/trunk Message-ID: <E1QMMUS-0003jl-66@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14590 http://gar.svn.sourceforge.net/gar/?rev=14590&view=rev Author: phipsy Date: 2011-05-17 15:47:19 +0000 (Tue, 17 May 2011) Log Message: ----------- Upped Puppet to 2.6.8 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-05-17 12:49:59 UTC (rev 14589) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-05-17 15:47:19 UTC (rev 14590) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.6 +VERSION = 2.6.8 CATEGORIES = apps define BLURB @@ -47,6 +47,7 @@ RUNTIME_DEP_PKGS = CSWfacter RUNTIME_DEP_PKGS += CSWruby +RUNTIME_DEP_PKGS += CSWrubyaugeas RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby @@ -71,23 +72,22 @@ # https://projects.puppetlabs.com/issues/6324 PATCHFILES += 0004-patch-to-smf-provider-6324.patch -CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter +CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby + +CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter +CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet -CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none -CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby # Puppet has hardcoded paths to look at for many OSes, many of which involve # /usr/share and /usr/local. -CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content +CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content -# These two files are quite deliberate - without them users will not get -# CSW behaviour. The README explains -CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet -CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/README.CSW -CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW +# These files are quite deliberate - without them users will not get CSW +# behaviour. The README explains +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/README.CSW +CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW - include gar/category.mk install-puppet: @@ -120,6 +120,5 @@ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup - # ( [ -d $(DESTDIR)/var/lib ] && echo "$(DESTDIR)/var/lib" must not exist && false ) || true mkdir -p $(DESTDIR)$(localstatedir)/lib @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-05-17 12:49:59 UTC (rev 14589) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-05-17 15:47:19 UTC (rev 14590) @@ -1,3 +1,4 @@ c0b86f40c8000dae2f0f7f2f91579c2a puppet-2.6.4.tar.gz 645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz 58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz +588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-17 12:49:59 UTC (rev 14589) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2011-05-17 15:47:19 UTC (rev 14590) @@ -15,6 +15,7 @@ if [ ! -d $PKG_INSTALL_ROOT/var/lib ]; then /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/mkdir -p /var/lib/puppet + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/chown puppet /var/lib/puppet if [ ! -d $PKG_INSTALL_ROOT/var/opt/csw/puppet ]; then /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/lib/puppet /var/opt/csw/puppet fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue May 17 17:47:48 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 17 May 2011 15:47:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14591] csw/mgar/pkg/puppet/tags/puppet-2.6.8, REV=2011.05. 17/ Message-ID: <E1QMMUu-0003kG-1Q@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14591 http://gar.svn.sourceforge.net/gar/?rev=14591&view=rev Author: phipsy Date: 2011-05-17 15:47:47 +0000 (Tue, 17 May 2011) Log Message: ----------- puppet: Tag as release 2.6.8,REV=2011.05.17 Added Paths: ----------- csw/mgar/pkg/puppet/tags/puppet-2.6.8,REV=2011.05.17/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 17 19:28:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 May 2011 17:28:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14592] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: <E1QMO45-00061P-00@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14592 http://gar.svn.sourceforge.net/gar/?rev=14592&view=rev Author: bdwalton Date: 2011-05-17 17:28:12 +0000 (Tue, 17 May 2011) Log Message: ----------- cswutils/trunk: add missing CSWpy-curl dependency Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 15:47:47 UTC (rev 14591) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 17:28:12 UTC (rev 14592) @@ -38,6 +38,7 @@ RUNTIME_DEP_PKGS += CSWpy-progressbar RUNTIME_DEP_PKGS += CSWpy-sqlobject RUNTIME_DEP_PKGS += CSWpy-yaml +RUNTIME_DEP_PKGS += CSWpy-curl RUNTIME_DEP_PKGS += CSWpython WORKSRC = $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 17 19:31:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 May 2011 17:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14593] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: <E1QMO6m-0006nh-2Y@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14593 http://gar.svn.sourceforge.net/gar/?rev=14593&view=rev Author: bdwalton Date: 2011-05-17 17:30:59 +0000 (Tue, 17 May 2011) Log Message: ----------- cswutils/trunk: drop CSWpy-yaml dep Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 17:28:12 UTC (rev 14592) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 17:30:59 UTC (rev 14593) @@ -37,7 +37,6 @@ RUNTIME_DEP_PKGS += CSWpy-libmagic RUNTIME_DEP_PKGS += CSWpy-progressbar RUNTIME_DEP_PKGS += CSWpy-sqlobject -RUNTIME_DEP_PKGS += CSWpy-yaml RUNTIME_DEP_PKGS += CSWpy-curl RUNTIME_DEP_PKGS += CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 17 19:33:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 May 2011 17:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14594] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: <E1QMO9K-00069Q-Nr@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14594 http://gar.svn.sourceforge.net/gar/?rev=14594&view=rev Author: bdwalton Date: 2011-05-17 17:33:38 +0000 (Tue, 17 May 2011) Log Message: ----------- cswutils/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 17:30:59 UTC (rev 14593) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-17 17:33:38 UTC (rev 14594) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.17 +VERSION = 1.18 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 17 21:34:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 May 2011 19:34:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14595] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: <E1QMQ1t-0008Mw-3n@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14595 http://gar.svn.sourceforge.net/gar/?rev=14595&view=rev Author: bdwalton Date: 2011-05-17 19:34:04 +0000 (Tue, 17 May 2011) Log Message: ----------- bacula/trunk: unzip all the nicely zipped manpages. need to patch this cleanly for upstream but do not see how yet. Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-17 17:33:38 UTC (rev 14594) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-17 19:34:04 UTC (rev 14595) @@ -325,3 +325,6 @@ mkdir -p pkg/CSWbacula-fd; \ echo ":bacula::::::" > pkg/CSWbacula-fd/cswusergroup; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services) + @echo Unzipping manpages...a hack for now... + @(cd $(PKGROOT)/opt/csw/share/man; \ + find . -name '*gz' -print | xargs gunzip ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 10:47:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 08:47:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14596] csw/mgar/pkg/libpcap/trunk/Makefile Message-ID: <E1QMcPY-0000Id-CB@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14596 http://gar.svn.sourceforge.net/gar/?rev=14596&view=rev Author: dmichelsen Date: 2011-05-18 08:47:20 +0000 (Wed, 18 May 2011) Log Message: ----------- libpcap: Split packages Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2011-05-17 19:34:04 UTC (rev 14595) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2011-05-18 08:47:20 UTC (rev 14596) @@ -8,30 +8,33 @@ endef MASTER_SITES = http://www.tcpdump.org/release/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.tcpdump.org/ + LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibpcap1 +SPKG_DESC_CSWlibpcap1 = System-independent interface for user-level packet capture, libpcap.so.1 +PKGFILES_CSWlibpcap1 += $(call pkgfiles_lib,libpcap.so.1) +PKGFILES_CSWlibpcap1 += $(mandir)/man5/.* +OBSOLETED_BY_CSWlibpcap1 += CSWlibpcap -PACKAGES = CSWlibpcap CSWlibpcapdevel +PACKAGES += CSWlibpcap-dev +SPKG_DESC_CSWlibpcap-dev = Development files for libpcap +RUNTIME_DEP_PKGS_CSWlibpcap-dev = CSWlibpcap1 +# PKGFILES is catchall +# Lots of packages require libpcap.so as the old library didn't have a SONAME set. +# As this link is only in CSWlibpcap-dev the old CSWlibpcap needs to depend on it. +OBSOLETED_BY_CSWlibpcap-dev += CSWlibpcap +OBSOLETED_BY_CSWlibpcap-dev += CSWlibpcapdevel +CATALOGNAME_CSWlibpcapdevel = libpcap_devel_stub -CATALOGNAME_CSWlibpcap = libpcap -CATALOGNAME_CSWlibpcapdevel = libpcap_devel - -SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture -SPKG_DESC_CSWlibpcapdevel = Development files for libpcap - -RUNTIME_DEP_PKGS_CSWlibpcapdevel = CSWlibpcap - BUILD64 = 1 EXTRA_BUILD_ISAS_sparc = sparcv8plus EXTRA_BUILD_ISAS_i386 = pentium -TEST_TARGET = check - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 @@ -45,8 +48,7 @@ MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-pentium = $(libdir) -PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) +# These are in the binaries only and specifiy compiler lines for unused includes +CHECKPKG_OVERRIDES_CSWlibpcap1 += file-with-bad-content -CHECKPKG_OVERRIDES_CSWlibpcapdevel += surplus-dependency|CSWlibpcap - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 11:18:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 09:18:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14597] csw/mgar/pkg/tcpdump/trunk/Makefile Message-ID: <E1QMctT-0000kW-BM@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14597 http://gar.svn.sourceforge.net/gar/?rev=14597&view=rev Author: dmichelsen Date: 2011-05-18 09:18:14 +0000 (Wed, 18 May 2011) Log Message: ----------- tcpdump: Minor cleanup, no functional change Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2011-05-18 08:47:20 UTC (rev 14596) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2011-05-18 09:18:14 UTC (rev 14597) @@ -7,26 +7,28 @@ endef MASTER_SITES = http://www.tcpdump.org/release/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.tcpdump.org/ + LICENSE = LICENSE -BUILD_DEP_PKGS = CSWlibpcap CSWosslrt CSWossldevel CSWlibsmi -RUNTIME_DEP_PKGS = CSWlibpcap CSWosslrt CSWlibsmi +BUILD_DEP_PKGS += CSWlibpcap +BUILD_DEP_PKGS += CSWosslrt +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibsmi +RUNTIME_DEP_PKGS += CSWlibpcap +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWlibsmi -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://www.tcpdump.org/ - -# No test target for libpcap -TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-crypto=$(prefix) CONFIGURE_ARGS += --with-smi +# We don't have a proper uudecode +TEST_SCRIPTS = + # There is a versioned tcpdump, which is not a hardlink. No need for that. EXTRA_MERGE_EXCLUDE_FILES = $(sbindir)/tcpdump\..* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 13:11:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 11:11:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14598] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: <E1QMefO-00039O-FK@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14598 http://gar.svn.sourceforge.net/gar/?rev=14598&view=rev Author: dmichelsen Date: 2011-05-18 11:11:50 +0000 (Wed, 18 May 2011) Log Message: ----------- fftw: Split packages, enable fortran for dfftw, make separate Solaris 10 package for long double Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2011-05-18 09:18:14 UTC (rev 14597) +++ csw/mgar/pkg/fftw/trunk/Makefile 2011-05-18 11:11:50 UTC (rev 14598) @@ -12,28 +12,50 @@ endef MASTER_SITES = http://www.fftw.org/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# 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.fftw.org/ -SPKG_SOURCEURL = http://www.fftw.org/ +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGES += CSWlibfftw3-3 +SPKG_DESC_CSWlibfftw3-3 = Library for computing the discrete Fourier transform (DFT), libfftw3.so.3 +PKGFILES_CSWlibfftw3-3 = $(call pkgfiles_lib,libfftw3.so.3) + +PACKAGES += CSWlibfftw3threads3 +SPKG_DESC_CSWlibfftw3threads3 = Library for computing the discrete Fourier transform (DFT), libfftw3_threads.so.3 +PKGFILES_CSWlibfftw3threads3 = $(call pkgfiles_lib,libfftw3_threads.so.3) + +PACKAGES += CSWlibfftw-dev +SPKG_DESC_CSWlibfftw-dev = Development files for libfftw3.so.3 +PKGFILES_CSWlibfftw-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibfftw-dev += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibfftw-dev += CSWlibfftw3threads3 + +PACKAGES += CSWfftw +SPKG_DESC_CSWfftw = Utilities for computing the discrete Fourier transform (DFT) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWfftw += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWfftw += CSWlibfftw3threads3 + BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-shared=yes CONFIGURE_ARGS += --enable-alloca -CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-portable-binary +# CONFIGURE_ARGS += --disable-fortran #CONFIGURE_ARGS += --enable-mpi -CONFIGURE_ARGS += --enable-portable-binary -CONFIGURE_ARGS += --disable-fortran #CONFIGURE_ARGS += --enable-openmp CONFIGURE_ARGS += --enable-threads -TEST_TARGET = check +# This is only available for Solaris 10 +CONFIGURE_ARGS-5.10 += --enable-long-double +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) + MERGE_DIRS_isa-extra = $(bindir) $(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 13:21:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 11:21:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14599] csw/mgar/pkg/haproxy/trunk Message-ID: <E1QMep4-0005ea-Sw@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14599 http://gar.svn.sourceforge.net/gar/?rev=14599&view=rev Author: dmichelsen Date: 2011-05-18 11:21:50 +0000 (Wed, 18 May 2011) Log Message: ----------- haproxy: Update to 1.4.15 and minor adjustments Modified Paths: -------------- csw/mgar/pkg/haproxy/trunk/Makefile csw/mgar/pkg/haproxy/trunk/checksums Modified: csw/mgar/pkg/haproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/haproxy/trunk/Makefile 2011-05-18 11:11:50 UTC (rev 14598) +++ csw/mgar/pkg/haproxy/trunk/Makefile 2011-05-18 11:21:50 UTC (rev 14599) @@ -6,7 +6,7 @@ # * Use the shipped Makefile optimization flags # NAME = haproxy -VERSION = 1.4.1 +VERSION = 1.4.15 CATEGORIES = apps DESCRIPTION = Reliable, high performance TCP/HTTP load balancer @@ -21,12 +21,13 @@ possibility not to expose fragile web servers to the Net. endef -VENDOR_URL = http://haproxy.1wt.eu/ MASTER_SITES = http://haproxy.1wt.eu/download/1.4/src/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -UPSTREAM_MASTER_SITES = $(VENDOR_URL) +DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://haproxy.1wt.eu/ + +LICENSE = LICENSE + # Heavily optimized, supported for gcc, didn't dare to touch GARCOMPILER = GCC4 @@ -43,6 +44,13 @@ PREFIX=$(prefix) \ DOCDIR=$(docdir)/$(NAME) +# Don't care for now, investigate later! +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/haproxy.1 +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/haproxy.1 +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/build.cfg +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg + include gar/category.mk # Makefile contains references to install Modified: csw/mgar/pkg/haproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/haproxy/trunk/checksums 2011-05-18 11:11:50 UTC (rev 14598) +++ csw/mgar/pkg/haproxy/trunk/checksums 2011-05-18 11:21:50 UTC (rev 14599) @@ -1 +1 @@ -7f27c2dec3d67fce1b113be5fe878c33 haproxy-1.4.1.tar.gz +c1b4fc6028c6d8e23dde8c91ff47eabe haproxy-1.4.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 15:49:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 13:49:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14600] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: <E1QMh7h-0007Mh-ME@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14600 http://gar.svn.sourceforge.net/gar/?rev=14600&view=rev Author: dmichelsen Date: 2011-05-18 13:49:13 +0000 (Wed, 18 May 2011) Log Message: ----------- fftw: Add longdouble modulation Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2011-05-18 11:21:50 UTC (rev 14599) +++ csw/mgar/pkg/fftw/trunk/Makefile 2011-05-18 13:49:13 UTC (rev 14600) @@ -16,6 +16,17 @@ VENDOR_URL = http://www.fftw.org/ +EXTRA_MODULATORS = LONGDOUBLE +MODULATIONS_LONGDOUBLE = no yes + +# Solaris 9 package does not contain 64 bit on i386 as we have a separate Solaris 10 package +SKIP_MODULATIONS-5.9 += isa-amd64-longdouble-no isa-amd64-longdouble-yes + +# Solaris 9 does not have long double support at all +SKIP_MODULATIONS-5.9 += isa-sparcv8-longdouble-yes isa-sparcv9-longdouble-yes +SKIP_MODULATIONS-5.9 += isa-i386-longdouble-yes isa-amd64-longdouble-no isa-amd64-longdouble-yes +SKIP_MODULATIONS = $(SKIP_MODULATIONS-$(GAROSREL)) + PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -23,22 +34,38 @@ SPKG_DESC_CSWlibfftw3-3 = Library for computing the discrete Fourier transform (DFT), libfftw3.so.3 PKGFILES_CSWlibfftw3-3 = $(call pkgfiles_lib,libfftw3.so.3) +PACKAGES-5.10 += CSWlibfftw3l3 +SPKG_DESC_CSWlibfftw3l3 = Library for computing the discrete Fourier transform (DFT) in long double, libfftw3l.so.3 +PKGFILES_CSWlibfftw3l3 = $(call pkgfiles_lib,libfftw3l.so.3) + PACKAGES += CSWlibfftw3threads3 SPKG_DESC_CSWlibfftw3threads3 = Library for computing the discrete Fourier transform (DFT), libfftw3_threads.so.3 PKGFILES_CSWlibfftw3threads3 = $(call pkgfiles_lib,libfftw3_threads.so.3) +PACKAGES-5.10 += CSWlibfftw3l-threads3 +SPKG_DESC_CSWlibfftw3l-threads3 = Library for computing the discrete Fourier transform (DFT) in long double, libfftw3_threads.so.3 +PKGFILES_CSWlibfftw3l-threads3 = $(call pkgfiles_lib,libfftw3l_threads.so.3) + PACKAGES += CSWlibfftw-dev SPKG_DESC_CSWlibfftw-dev = Development files for libfftw3.so.3 PKGFILES_CSWlibfftw-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibfftw-dev += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWlibfftw-dev += CSWlibfftw3threads3 +RUNTIME_DEP_PKGS_CSWlibfftw-dev-5.10 += CSWlibfftw3l3 +RUNTIME_DEP_PKGS_CSWlibfftw-dev-5.10 += CSWlibfftw3l-threads3 +RUNTIME_DEP_PKGS_CSWlibfftw-dev += $(RUNTIME_DEP_PKGS_CSWlibfftw-dev-$(GAROSREL)) PACKAGES += CSWfftw SPKG_DESC_CSWfftw = Utilities for computing the discrete Fourier transform (DFT) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWfftw += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWfftw += CSWlibfftw3threads3 +RUNTIME_DEP_PKGS_CSWfftw-5.10 += CSWlibfftw3l3 +RUNTIME_DEP_PKGS_CSWfftw-5.10 += CSWlibfftw3l-threads3 +RUNTIME_DEP_PKGS_CSWfftw += $(RUNTIME_DEP_PKGS_CSWfftw-$(GAROSREL)) +PACKAGES += $(PACKAGES-$(GAROSREL)) + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -46,16 +73,20 @@ CONFIGURE_ARGS += --enable-shared=yes CONFIGURE_ARGS += --enable-alloca CONFIGURE_ARGS += --enable-portable-binary -# CONFIGURE_ARGS += --disable-fortran #CONFIGURE_ARGS += --enable-mpi #CONFIGURE_ARGS += --enable-openmp CONFIGURE_ARGS += --enable-threads # This is only available for Solaris 10 -CONFIGURE_ARGS-5.10 += --enable-long-double +CONFIGURE_ARGS-5.10-longdouble-yes += --enable-long-double -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-longdouble-$(LONGDOUBLE)) -MERGE_DIRS_isa-extra = $(bindir) $(libdir) +MERGE_SCRIPTS_isa-default-longdouble-no = copy-all +MERGE_SCRIPTS_isa-extra-longdouble-no = copy-relocate +MERGE_DIRS_isa-extra-longdouble-no = $(bindir) $(libdir) +MERGE_SCRIPTS_isa-default-longdouble-yes = copy-all +MERGE_SCRIPTS_isa-extra-longdouble-yes = copy-relocate +MERGE_DIRS_isa-extra-longdouble-yes = $(bindir) $(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 18 16:29:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 14:29:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14601] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: <E1QMhkx-0007UW-KD@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14601 http://gar.svn.sourceforge.net/gar/?rev=14601&view=rev Author: bdwalton Date: 2011-05-18 14:29:47 +0000 (Wed, 18 May 2011) Log Message: ----------- bacula/trunk: update pkgfiles statements to grab regular manpages intead of gzipped versions Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 13:49:13 UTC (rev 14600) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 14:29:47 UTC (rev 14601) @@ -114,8 +114,8 @@ PKGFILES_CSWbacula-common += .*libbacpy-$(VERSION).so .*libbacpy.so PKGFILES_CSWbacula-common += .*libbacsql-$(VERSION).so .*libbacsql.so PKGFILES_CSWbacula-common += .*sbin/bsmtp .*sbin/btraceback -PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz -PKGFILES_CSWbacula-common += .*man8/bacula.8.gz +PKGFILES_CSWbacula-common += .*man1/bsmtp.1 .*man1/btraceback.1 +PKGFILES_CSWbacula-common += .*man8/bacula.8 PKGFILES_CSWbacula-common += .*libexec/bacula/btraceback.* CATALOGNAME_CSWbacula-fd = bacula_fd @@ -130,7 +130,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working -PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8.gz .*bacula/bacula-fd.conf.CSW +PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8 .*bacula/bacula-fd.conf.CSW PKGFILES_CSWbacula-fd += /var/opt/csw/run PKGFILES_CSWbacula-fd += .*bacula_fd/.*postmsg PKGFILES_CSWbacula-fd += /etc/opt/csw/pkg/CSWbacula-fd/cswusergroup @@ -154,9 +154,9 @@ PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/mtx-changer.conf.CSW PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape -PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8.gz .*man8/bextract.8.gz -PKGFILES_CSWbacula-sd += .*man8/bls.8.gz .*man8/btape.8.gz .*bacula/working -PKGFILES_CSWbacula-sd += .*man8/bcopy.8.gz .*man8/bscan.8.gz +PKGFILES_CSWbacula-sd += .*man8/bacula-sd.8 .*man8/bextract.8 +PKGFILES_CSWbacula-sd += .*man8/bls.8 .*man8/btape.8 .*bacula/working +PKGFILES_CSWbacula-sd += .*man8/bcopy.8 .*man8/bscan.8 PKGFILES_CSWbacula-sd += /var/opt/csw/run PKGFILES_CSWbacula-sd += $(localstatedir)/$(NAME)/archive PKGFILES_CSWbacula-sd += .*bacula_sd/.*postmsg @@ -187,7 +187,7 @@ PKGFILES_CSWbacula-director += .*libexec/bacula/.*_catalog.* PKGFILES_CSWbacula-director += .*libexec/bacula/update.*tables.* PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW -PKGFILES_CSWbacula-director += .*man8/bacula-dir.8.gz .*man8/dbcheck.8.gz +PKGFILES_CSWbacula-director += .*man8/bacula-dir.8 .*man8/dbcheck.8 PKGFILES_CSWbacula-director += /var/opt/csw/run PKGFILES_CSWbacula-director += .*share/doc/bacula_director/README.CSW PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 18 16:36:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 14:36:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14602] csw/mgar/pkg/bacula/trunk Message-ID: <E1QMhrN-0007cZ-Nd@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14602 http://gar.svn.sourceforge.net/gar/?rev=14602&view=rev Author: bdwalton Date: 2011-05-18 14:36:25 +0000 (Wed, 18 May 2011) Log Message: ----------- bacula/trunk: override and document usr/share reference in bacula man page Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 14:29:47 UTC (rev 14601) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 14:36:25 UTC (rev 14602) @@ -117,6 +117,7 @@ PKGFILES_CSWbacula-common += .*man1/bsmtp.1 .*man1/btraceback.1 PKGFILES_CSWbacula-common += .*man8/bacula.8 PKGFILES_CSWbacula-common += .*libexec/bacula/btraceback.* +CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/bacula.8 CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes =================================================================== --- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes 2011-05-18 14:36:25 UTC (rev 14602) @@ -0,0 +1 @@ +The usr/share reference in the bacula.8 manpage is harmless. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 18 16:38:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 14:38:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14603] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: <E1QMhtG-0002rg-Tg@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14603 http://gar.svn.sourceforge.net/gar/?rev=14603&view=rev Author: bdwalton Date: 2011-05-18 14:38:22 +0000 (Wed, 18 May 2011) Log Message: ----------- bacula/trunk: enable inclusion of release notes for bacula_common Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 14:36:25 UTC (rev 14602) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-05-18 14:38:22 UTC (rev 14603) @@ -13,6 +13,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWbacula-doc.cswreleasenotes +DISTFILES += CSWbacula-common.cswreleasenotes DISTFILES += README.CSW DISTFILES += CSWbacula-director.postinstall DISTFILES += CSWbacula-sd.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 18 17:38:04 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 May 2011 15:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14604] csw/mgar/pkg/pv/trunk Message-ID: <E1QMip2-0003uq-MG@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14604 http://gar.svn.sourceforge.net/gar/?rev=14604&view=rev Author: skayser Date: 2011-05-18 15:38:04 +0000 (Wed, 18 May 2011) Log Message: ----------- pv/trunk: version bump to 1.2.0 Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pv/trunk/checksums csw/mgar/pkg/pv/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2011-05-18 14:38:22 UTC (rev 14603) +++ csw/mgar/pkg/pv/trunk/Makefile 2011-05-18 15:38:04 UTC (rev 14604) @@ -1,5 +1,5 @@ NAME = pv -VERSION = 1.1.4 +VERSION = 1.2.0 CATEGORIES = utils DESCRIPTION = Monitor the progress of data through a pipe @@ -12,31 +12,25 @@ completion. endef -# Project URL -SPKG_SOURCEURL = http://www.ivarch.com/programs/pv.shtml - -# Source files +VENDOR_URL = http://www.ivarch.com/programs/pv.shtml MASTER_SITES = http://pipeviewer.googlecode.com/files/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -LICENSE = doc/COPYING +DISTFILES = $(NAME)-$(VERSION).tar.gz +LICENSE = doc/COPYING +UPSTREAM_MASTER_SITES = $(VENDOR_URL) + RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# Test with dd (010-dd) is unrealiable because of partial reads on SPARC. -# Upstream patch for a rewritten test is pending. -# Substituted with 010-opencsw-cksum in the meantime. -# See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324308 -PATCHFILES = fix-test-010.diff - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk +# test-012 uses tr complements (-c) which don't work with /usr/bin/tr +PATH := /opt/csw/gnu:$(PATH) + post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: - @gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz - @ginstall -d -m 755 $(DOCDEST) - @cp $(WORKSRC)/doc/NEWS $(FILEDIR)/changelog.CSW $(DOCDEST) + gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz + ginstall -d -m 755 $(DOCDEST) + cp $(WORKSRC)/doc/NEWS $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2011-05-18 14:38:22 UTC (rev 14603) +++ csw/mgar/pkg/pv/trunk/checksums 2011-05-18 15:38:04 UTC (rev 14604) @@ -1,3 +1 @@ -8d0eda2182640919daaf6186cd816a13 download/pv-1.1.4.tar.gz -6e307b98bc517acb6353981bee5e686c download/CSWpv.gspec -f4de09711819fdb79aee3fa0c612caca download/fix-test-010.diff +f7cc65c850ac98c6013cc448050eee4b pv-1.2.0.tar.gz Modified: csw/mgar/pkg/pv/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pv/trunk/files/changelog.CSW 2011-05-18 14:38:22 UTC (rev 14603) +++ csw/mgar/pkg/pv/trunk/files/changelog.CSW 2011-05-18 15:38:04 UTC (rev 14604) @@ -1,3 +1,9 @@ +pv (1.2.0,REV=2011.05.18) + + * Updated to 1.2.0. + + -- Sebastian Kayser <skayser at opencsw.org> Wed, 18 May 2011 17:35:36 +0200 + pv (1.1.4,REV=2009.05.10) * Recompiled with adjusted GAR build system (Closes: #3573). Deleted: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff =================================================================== --- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2011-05-18 14:38:22 UTC (rev 14603) +++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2011-05-18 15:38:04 UTC (rev 14604) @@ -1,50 +0,0 @@ -diff --speed-large-files --minimal -Nru pv-1.1.4.orig/tests/010-dd pv-1.1.4/tests/010-dd ---- pv-1.1.4.orig/tests/010-dd 2007-02-19 15:00:45.000000000 +0100 -+++ pv-1.1.4/tests/010-dd 2008-12-09 23:53:24.620543043 +0100 -@@ -1,14 +1,22 @@ - #!/bin/sh - # - # Check that dd doesn't cause a SIGPIPE and doesn't drop data. -+# -+# OpenCSW: -+# * Test with dd is unrealiable because of partial reads on SPARC. -+# * Upstream patch for a rewritten test is pending. -+# * Substituted with 010-opencsw-cksum in the meantime. -+# * See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324308 - - #COUNT1=`cat /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c` - # NB cat gets it wrong sometimes too! --COUNT1=100000000 --COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c` -+#COUNT1=100000000 -+#COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c` - - #echo "[$COUNT1] [$COUNT2]" - --test "x$COUNT1" = "x$COUNT2" -+#test -z """x$COUNT1" = "x$COUNT2" -+ -+: - - # EOF -diff --speed-large-files --minimal -Nru pv-1.1.4.orig/tests/010-opencsw-cksum pv-1.1.4/tests/010-opencsw-cksum ---- pv-1.1.4.orig/tests/010-opencsw-cksum 1970-01-01 01:00:00.000000000 +0100 -+++ pv-1.1.4/tests/010-opencsw-cksum 2008-12-09 23:46:26.094207757 +0100 -@@ -0,0 +1,17 @@ -+#!/bin/sh -+# -+# Transfer a chunk of data through pv and check data correctness -+# afterwards. -+ -+# generate some data (10MB) -+dd if=/dev/urandom of=$TMP1 bs=1024 count=10240 2>/dev/null -+ -+# read through pv and test afterwards -+${PROG} -B 100000 -q $TMP1 > $TMP2 -+ -+CKSUM1=`cksum $TMP1 | awk '{ print $1 }` -+CKSUM2=`cksum $TMP2 | awk '{ print $1 }` -+ -+test "x$CKSUM1" = "x$CKSUM2" -+ -+# EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed May 18 17:43:24 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 May 2011 15:43:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14605] csw/mgar/pkg/pv/trunk/Makefile Message-ID: <E1QMiuC-0004VV-4E@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14605 http://gar.svn.sourceforge.net/gar/?rev=14605&view=rev Author: skayser Date: 2011-05-18 15:43:23 +0000 (Wed, 18 May 2011) Log Message: ----------- pv/trunk: i18n handling changed, thus runtimed deps also Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2011-05-18 15:38:04 UTC (rev 14604) +++ csw/mgar/pkg/pv/trunk/Makefile 2011-05-18 15:43:23 UTC (rev 14605) @@ -19,7 +19,7 @@ UPSTREAM_MASTER_SITES = $(VENDOR_URL) -RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt +RUNTIME_DEP_PKGS = CSWlibintl8 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 18 18:44:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 May 2011 16:44:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14606] csw/mgar/pkg/ucarp/trunk Message-ID: <E1QMjr7-0003Me-OX@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14606 http://gar.svn.sourceforge.net/gar/?rev=14606&view=rev Author: dmichelsen Date: 2011-05-18 16:44:17 +0000 (Wed, 18 May 2011) Log Message: ----------- ucarp: Make it compile Modified Paths: -------------- csw/mgar/pkg/ucarp/trunk/Makefile csw/mgar/pkg/ucarp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ucarp/trunk/files/0001-Solaris-hacks.patch csw/mgar/pkg/ucarp/trunk/files/0002-Remove-double-invocation-of-SHELL.patch Modified: csw/mgar/pkg/ucarp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ucarp/trunk/Makefile 2011-05-18 15:43:23 UTC (rev 14605) +++ csw/mgar/pkg/ucarp/trunk/Makefile 2011-05-18 16:44:17 UTC (rev 14606) @@ -14,11 +14,15 @@ Protocol (CARP, OpenBSD's alternative to the patents-bloated VRRP). endef -VENDOR_URL = http://www.ucarp.org/project/ucarp MASTER_SITES = http://download.pureftpd.org/pub/ucarp/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES += $(DISTNAME).tar.bz2 -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES += 0001-Solaris-hacks.patch +PATCHFILES += 0002-Remove-double-invocation-of-SHELL.patch +VENDOR_URL = http://www.ucarp.org/project/ucarp + +RUNTIME_DEP_PKGS_CSWucarp += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWucarp += CSWlibpcap1 + include gar/category.mk Modified: csw/mgar/pkg/ucarp/trunk/checksums =================================================================== --- csw/mgar/pkg/ucarp/trunk/checksums 2011-05-18 15:43:23 UTC (rev 14605) +++ csw/mgar/pkg/ucarp/trunk/checksums 2011-05-18 16:44:17 UTC (rev 14606) @@ -1 +1 @@ -e3caa733316a32c09e5d3817617e9145 ucarp-1.5.2.tar.gz +723636dbf79fc6abd329a71ec4ddf79d ucarp-1.5.2.tar.bz2 Added: csw/mgar/pkg/ucarp/trunk/files/0001-Solaris-hacks.patch =================================================================== --- csw/mgar/pkg/ucarp/trunk/files/0001-Solaris-hacks.patch (rev 0) +++ csw/mgar/pkg/ucarp/trunk/files/0001-Solaris-hacks.patch 2011-05-18 16:44:17 UTC (rev 14606) @@ -0,0 +1,127 @@ +From 462481081513bb9513a7ec2690ad98f7d75084ba Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <dam at opencsw.org> +Date: Wed, 18 May 2011 18:14:26 +0200 +Subject: [PATCH] Solaris hacks + +--- + src/carp.c | 70 ++++++++++++++++++++++++++++++++------------------------ + src/ip_carp.h | 5 ++++ + 2 files changed, 45 insertions(+), 30 deletions(-) + +diff --git a/src/carp.c b/src/carp.c +index 0ac5aa7..d08ee56 100644 +--- a/src/carp.c ++++ b/src/carp.c +@@ -48,6 +48,16 @@ + # include <dmalloc.h> + #endif + ++#define timersub(a,b,result) \ ++ do { \ ++ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ ++ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ ++ if ((result)->tv_usec < 0) { \ ++ --(result)->tv_sec; \ ++ (result)->tv_usec += 1000000; \ ++ } \ ++ } while (0) ++ + static void carp_set_state(struct carp_softc *sc, int state) + { + if ((int) sc->sc_state == state) { +@@ -247,27 +257,27 @@ static void carp_send_ad(struct carp_softc *sc) + sum = cksum(&ch, sizeof ch); + ch.carp_cksum = htons(sum); + +- eh.ether_shost[0] = 0x00; +- eh.ether_shost[1] = 0x00; +- eh.ether_shost[2] = 0x5e; +- eh.ether_shost[3] = 0x00; +- eh.ether_shost[4] = 0x00; +- eh.ether_shost[5] = vhid; ++ eh.ether_shost.ether_addr_octet[0] = 0x00; ++ eh.ether_shost.ether_addr_octet[1] = 0x00; ++ eh.ether_shost.ether_addr_octet[2] = 0x5e; ++ eh.ether_shost.ether_addr_octet[3] = 0x00; ++ eh.ether_shost.ether_addr_octet[4] = 0x00; ++ eh.ether_shost.ether_addr_octet[5] = vhid; + + if (no_mcast) { +- eh.ether_dhost[0] = 0xff; +- eh.ether_dhost[1] = 0xff; +- eh.ether_dhost[2] = 0xff; +- eh.ether_dhost[3] = 0xff; +- eh.ether_dhost[4] = 0xff; +- eh.ether_dhost[5] = 0xff; ++ eh.ether_dhost.ether_addr_octet[0] = 0xff; ++ eh.ether_dhost.ether_addr_octet[1] = 0xff; ++ eh.ether_dhost.ether_addr_octet[2] = 0xff; ++ eh.ether_dhost.ether_addr_octet[3] = 0xff; ++ eh.ether_dhost.ether_addr_octet[4] = 0xff; ++ eh.ether_dhost.ether_addr_octet[5] = 0xff; + } else { +- eh.ether_dhost[0] = 0x01; +- eh.ether_dhost[1] = 0x00; +- eh.ether_dhost[2] = 0x5e; +- eh.ether_dhost[3] = 0x00; +- eh.ether_dhost[4] = 0x00; +- eh.ether_dhost[5] = 0x12; ++ eh.ether_dhost.ether_addr_octet[0] = 0x01; ++ eh.ether_dhost.ether_addr_octet[1] = 0x00; ++ eh.ether_dhost.ether_addr_octet[2] = 0x5e; ++ eh.ether_dhost.ether_addr_octet[3] = 0x00; ++ eh.ether_dhost.ether_addr_octet[4] = 0x00; ++ eh.ether_dhost.ether_addr_octet[5] = 0x12; + } + eh.ether_type = htons(ETHERTYPE_IP); + +@@ -433,18 +443,18 @@ static void packethandler(unsigned char *dummy, + logfile(LOG_DEBUG, "Ethernet " + "[%02x:%02x:%02x:%02x:%02x:%02x]->[%02x:%02x:%02x:%02x:%02x:%02x] " + "type [%04x]", +- (unsigned int) etherhead.ether_shost[0], +- (unsigned int) etherhead.ether_shost[1], +- (unsigned int) etherhead.ether_shost[2], +- (unsigned int) etherhead.ether_shost[3], +- (unsigned int) etherhead.ether_shost[4], +- (unsigned int) etherhead.ether_shost[5], +- (unsigned int) etherhead.ether_dhost[0], +- (unsigned int) etherhead.ether_dhost[1], +- (unsigned int) etherhead.ether_dhost[2], +- (unsigned int) etherhead.ether_dhost[3], +- (unsigned int) etherhead.ether_dhost[4], +- (unsigned int) etherhead.ether_dhost[5], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[0], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[1], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[2], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[3], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[4], ++ (unsigned int) etherhead.ether_shost.ether_addr_octet[5], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[0], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[1], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[2], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[3], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[4], ++ (unsigned int) etherhead.ether_dhost.ether_addr_octet[5], + (unsigned int) ntohs(etherhead.ether_type)); + #endif + sp += sizeof etherhead; +diff --git a/src/ip_carp.h b/src/ip_carp.h +index 9504a8e..e7e1f54 100644 +--- a/src/ip_carp.h ++++ b/src/ip_carp.h +@@ -54,6 +54,11 @@ + #ifndef __IP_CARP_H__ + #define __IP_CARP_H__ 1 + ++#define u_int8_t uint8_t ++#define u_int16_t uint16_t ++#define u_int32_t uint32_t ++#define u_int64_t uint64_t ++ + struct carp_header { + #ifdef WORDS_BIGENDIAN + u_int8_t carp_version:4, +-- +1.7.3.2 + Added: csw/mgar/pkg/ucarp/trunk/files/0002-Remove-double-invocation-of-SHELL.patch =================================================================== --- csw/mgar/pkg/ucarp/trunk/files/0002-Remove-double-invocation-of-SHELL.patch (rev 0) +++ csw/mgar/pkg/ucarp/trunk/files/0002-Remove-double-invocation-of-SHELL.patch 2011-05-18 16:44:17 UTC (rev 14606) @@ -0,0 +1,25 @@ +From b836965f62ece383a84a12b94fc0f9659b617940 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <dam at opencsw.org> +Date: Wed, 18 May 2011 18:37:55 +0200 +Subject: [PATCH] Remove double invocation of $SHELL + +--- + po/Makefile.in.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/po/Makefile.in.in b/po/Makefile.in.in +index fecf500..19f5a07 100644 +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -40,7 +40,7 @@ INSTALL_DATA = @INSTALL_DATA@ + # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake + # versions, $(mkinstalldirs) and $(install_sh) are unused. + mkinstalldirs = $(SHELL) @install_sh@ -d +-install_sh = $(SHELL) @install_sh@ ++install_sh = @install_sh@ + MKDIR_P = @MKDIR_P@ + mkdir_p = @mkdir_p@ + +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed May 18 19:19:03 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 18 May 2011 17:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14607] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: <E1QMkOl-00013A-4x@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14607 http://gar.svn.sourceforge.net/gar/?rev=14607&view=rev Author: phipsy Date: 2011-05-18 17:19:02 +0000 (Wed, 18 May 2011) Log Message: ----------- Puppet: dep CSWruby18, not CSWruby. Next release Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-05-18 16:44:17 UTC (rev 14606) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-05-18 17:19:02 UTC (rev 14607) @@ -46,10 +46,10 @@ SPKG_DESC_CSWpuppetmaster = System configuration management tool, server RUNTIME_DEP_PKGS = CSWfacter -RUNTIME_DEP_PKGS += CSWruby +RUNTIME_DEP_PKGS += CSWruby18 RUNTIME_DEP_PKGS += CSWrubyaugeas RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet -RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby +RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby18 PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 01:34:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 23:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14608] csw/mgar/pkg/exim/trunk Message-ID: <E1QMqG5-0007Lc-Ls@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14608 http://gar.svn.sourceforge.net/gar/?rev=14608&view=rev Author: bdwalton Date: 2011-05-18 23:34:29 +0000 (Wed, 18 May 2011) Log Message: ----------- exim/trunk: version bump to address CVE-2011-1407 Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/exim/trunk/checksums Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-18 17:19:02 UTC (rev 14607) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-18 23:34:29 UTC (rev 14608) @@ -1,5 +1,5 @@ NAME = exim -VERSION = 4.72 +VERSION = 4.76 CATEGORIES = server DESCRIPTION = The Exim Mail Transfer Agent Modified: csw/mgar/pkg/exim/trunk/checksums =================================================================== --- csw/mgar/pkg/exim/trunk/checksums 2011-05-18 17:19:02 UTC (rev 14607) +++ csw/mgar/pkg/exim/trunk/checksums 2011-05-18 23:34:29 UTC (rev 14608) @@ -1 +1 @@ -ccc937b533568e5e8340f181a3b3d2ff exim-4.72.tar.bz2 +58e784b33c7a2ab335ec6400346d6362 exim-4.76.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 19 01:37:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 May 2011 23:37:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14609] csw/mgar/gar/v2/lib/python/README Message-ID: <E1QMqJH-0003Ls-1r@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14609 http://gar.svn.sourceforge.net/gar/?rev=14609&view=rev Author: wahwah Date: 2011-05-18 23:37:46 +0000 (Wed, 18 May 2011) Log Message: ----------- checkpkg: README update, new check idea Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-05-18 23:34:29 UTC (rev 14608) +++ csw/mgar/gar/v2/lib/python/README 2011-05-18 23:37:46 UTC (rev 14609) @@ -16,6 +16,8 @@ the file's class needs to be 'ugfiles' - If there is bin/*-config and there is lib/(sparcv9|amd64)/.*, there must also be bin/(sparcv9|amd64)/*(-|_)config + - Binaries from /opt/csw/bin and/or sbin should not have the same names + as any binaries from /usr/bin and/or sbin. Checks implemented: - foo_bar != CSWfoo-bar -> error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 01:38:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 23:38:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14610] csw/mgar/pkg/exim/trunk/Makefile Message-ID: <E1QMqJu-0007UY-9o@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14610 http://gar.svn.sourceforge.net/gar/?rev=14610&view=rev Author: bdwalton Date: 2011-05-18 23:38:26 +0000 (Wed, 18 May 2011) Log Message: ----------- exim/trunk: we require the dev package for libspf2 after package splitting Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-18 23:37:46 UTC (rev 14609) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-18 23:38:26 UTC (rev 14610) @@ -25,7 +25,7 @@ PATCHFILES += 0003-Set-OpenCSW-build-options.patch PATCHFILES += 0004-Force-Compiler-and-a-few-compilation-options.patch -BUILD_DEP_PKGS = CSWlibspf2 +BUILD_DEP_PKGS = CSWlibspf2-dev RUNTIME_DEP_PKGS_CSWexim = CSWiconv CSWoldaprt CSWosslrt CSWsasl RUNTIME_DEP_PKGS_CSWexim += CSWmysql5rt CSWlibpq CSWlibspf2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 19 01:39:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 May 2011 23:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14611] csw/mgar/gar/v2/doc/Makefile Message-ID: <E1QMqKg-0003OY-Dv@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14611 http://gar.svn.sourceforge.net/gar/?rev=14611&view=rev Author: wahwah Date: 2011-05-18 23:39:14 +0000 (Wed, 18 May 2011) Log Message: ----------- doc: Copy diagrams to public_html if possible Modified Paths: -------------- csw/mgar/gar/v2/doc/Makefile Modified: csw/mgar/gar/v2/doc/Makefile =================================================================== --- csw/mgar/gar/v2/doc/Makefile 2011-05-18 23:38:26 UTC (rev 14610) +++ csw/mgar/gar/v2/doc/Makefile 2011-05-18 23:39:14 UTC (rev 14611) @@ -4,3 +4,6 @@ %.png: %.dot dot -Tpng -o $@ $< + if [ -d $(HOME)/public_html ]; \ + then cp $@ $(HOME)/public_html; \ + fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 19 01:39:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 May 2011 23:39:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14612] csw/mgar/gar/v2/doc Message-ID: <E1QMqLK-0007X2-Cb@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14612 http://gar.svn.sourceforge.net/gar/?rev=14612&view=rev Author: wahwah Date: 2011-05-18 23:39:54 +0000 (Wed, 18 May 2011) Log Message: ----------- doc: Release workflow Modified Paths: -------------- csw/mgar/gar/v2/doc/Makefile Added Paths: ----------- csw/mgar/gar/v2/doc/release-workflow.dot Modified: csw/mgar/gar/v2/doc/Makefile =================================================================== --- csw/mgar/gar/v2/doc/Makefile 2011-05-18 23:39:14 UTC (rev 14611) +++ csw/mgar/gar/v2/doc/Makefile 2011-05-18 23:39:54 UTC (rev 14612) @@ -1,6 +1,6 @@ all: diagrams -diagrams: connections.png +diagrams: connections.png release-workflow.png %.png: %.dot dot -Tpng -o $@ $< Added: csw/mgar/gar/v2/doc/release-workflow.dot =================================================================== --- csw/mgar/gar/v2/doc/release-workflow.dot (rev 0) +++ csw/mgar/gar/v2/doc/release-workflow.dot 2011-05-18 23:39:54 UTC (rev 14612) @@ -0,0 +1,31 @@ +// Package release workflow +// For the wiki page +// http://wiki.opencsw.org/releases-and-staging +// +// Also relevant: +// http://wiki.opencsw.org/automated-release-process + +digraph package_workflow { + build_description[label="Build description",shape="note"]; + build_description -> code_review [label="email"]; + code_review [label="Code review\non the devel mailing list"]; + srv4_on_disk[label="SRV4 file (.pkg.gz) on disk"]; + build_description -> checkpkg_preliminary [label="mgar"]; + checkpkg_preliminary [label="checkpkg (preliminary)",shape="diamond"]; + checkpkg_preliminary -> srv4_on_disk [label="checks passed"]; + checkpkg_preliminary -> reported_errors [label="checks failed"]; + reported_errors [label="Reported errors"]; + srv4_on_disk -> experimental [label="cp foo.pkg /home/experimental/<project>"]; + srv4_on_disk -> checkpkg [label="csw-upload-pkg foo.pkg"]; + checkpkg [shape="diamond",label="checkpkg\nagainst specific\ncatalogs"]; + checkpkg -> unstable [label="checks passed"]; + checkpkg -> rejected [label="checks failed"]; + unstable -> testing [label="2 weeks with no filed bugs"]; + testing -> stable [label="Release"]; + subgraph cluster0 { + label="Staging"; + unstable[label="unstable",shape="folder"]; + testing[label="testing",shape="folder"]; + stable[label="stable",shape="folder"]; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 01:54:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 18 May 2011 23:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14613] csw/mgar/pkg/exim/trunk/files Message-ID: <E1QMqZj-00081P-Dv@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14613 http://gar.svn.sourceforge.net/gar/?rev=14613&view=rev Author: bdwalton Date: 2011-05-18 23:54:47 +0000 (Wed, 18 May 2011) Log Message: ----------- exim/trunk: update patches for new version Modified Paths: -------------- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch Modified: csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch =================================================================== --- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2011-05-18 23:39:54 UTC (rev 14612) +++ csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2011-05-18 23:54:47 UTC (rev 14613) @@ -1,6 +1,6 @@ -From 5c1f33d87884e0c66ace1fd36e290cbe28d5c0de Mon Sep 17 00:00:00 2001 +From 9e08d89739eab7fc54c07068d8f5f902c89ec3c8 Mon Sep 17 00:00:00 2001 From: Ben Walton <bwalton at opencsw.org> -Date: Tue, 14 Dec 2010 03:31:46 +0100 +Date: Thu, 19 May 2011 01:47:39 +0200 Subject: [PATCH] Set OpenCSW build options Modify the template Local/Makefile to set the options for the csw @@ -12,7 +12,7 @@ 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Local/Makefile b/Local/Makefile -index 9869eb1..6ba1bf8 100644 +index b0335a9..e0e9e36 100644 --- a/Local/Makefile +++ b/Local/Makefile @@ -100,7 +100,7 @@ @@ -33,16 +33,16 @@ # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. -@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure - # owner of a local mailbox.) Specifying these values as root is very strongly - # discouraged. +@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure + # deliveries. (Local deliveries run as various non-root users, typically as the + # owner of a local mailbox.) Specifying these values as root is not supported. -EXIM_USER= +EXIM_USER=ref:exim # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this -@@ -176,7 +176,7 @@ EXIM_USER= +@@ -175,7 +175,7 @@ EXIM_USER= # Almost all installations choose this: @@ -51,7 +51,7 @@ -@@ -214,7 +214,7 @@ ROUTER_REDIRECT=yes +@@ -213,7 +213,7 @@ ROUTER_REDIRECT=yes # This one is very special-purpose, so is not included by default. @@ -60,7 +60,7 @@ #------------------------------------------------------------------------------ -@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes +@@ -234,7 +234,7 @@ TRANSPORT_SMTP=yes # This one is special-purpose, and commonly not required, so it is not # included by default. @@ -69,7 +69,7 @@ #------------------------------------------------------------------------------ -@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes +@@ -243,9 +243,9 @@ TRANSPORT_SMTP=yes # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -82,7 +82,7 @@ #------------------------------------------------------------------------------ -@@ -262,16 +262,16 @@ LOOKUP_DBM=yes +@@ -286,16 +286,16 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -107,7 +107,7 @@ # LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes -@@ -292,7 +292,7 @@ LOOKUP_DNSDB=yes +@@ -316,7 +316,7 @@ LOOKUP_DNSDB=yes # with Solaris 7 onwards. Uncomment whichever of these you are using. # LDAP_LIB_TYPE=OPENLDAP1 @@ -116,7 +116,7 @@ # LDAP_LIB_TYPE=NETSCAPE # LDAP_LIB_TYPE=SOLARIS -@@ -321,8 +321,8 @@ PCRE_LIBS=-lpcre +@@ -345,8 +345,8 @@ PCRE_LIBS=-lpcre # specified in INCLUDE. The settings below are just examples; -lpq is for # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. @@ -127,7 +127,7 @@ #------------------------------------------------------------------------------ -@@ -343,14 +343,14 @@ EXIM_MONITOR=eximon.bin +@@ -367,14 +367,14 @@ EXIM_MONITOR=eximon.bin # and the MIME ACL. Please read the documentation to learn more about these # features. @@ -142,9 +142,9 @@ -# WITH_OLD_DEMIME=yes +WITH_OLD_DEMIME=yes - #------------------------------------------------------------------------------ - # Compiling Exim with experimental features. These are documented in -@@ -361,9 +361,9 @@ EXIM_MONITOR=eximon.bin + # If you're using ClamAV and are backporting fixes to an old version, instead + # of staying current (which is the more usual approach) then you may need to +@@ -404,9 +404,9 @@ EXIM_MONITOR=eximon.bin # installed on your system (www.libspf2.org). Depending on where it is installed # you may have to edit the CFLAGS and LDFLAGS lines. @@ -156,16 +156,16 @@ # Uncomment the following lines to add SRS (Sender rewriting scheme) support. # You need to have libsrs_alt installed on your system (srs.mirtol.com). -@@ -451,7 +451,7 @@ FIXED_NEVER_USERS=root - # used. The prefix can be more restrictive than just a directory (the second - # example). +@@ -493,7 +493,7 @@ FIXED_NEVER_USERS=root + # configurations to be used. The prefix can be more restrictive than just a + # directory (the second example). -# ALT_CONFIG_PREFIX=/some/directory/ +ALT_CONFIG_PREFIX=/opt/csw/etc/exim/ # ALT_CONFIG_PREFIX=/some/directory/exim.conf- -@@ -486,11 +486,11 @@ FIXED_NEVER_USERS=root +@@ -552,11 +552,11 @@ FIXED_NEVER_USERS=root # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -182,7 +182,7 @@ #------------------------------------------------------------------------------ -@@ -498,7 +498,7 @@ FIXED_NEVER_USERS=root +@@ -564,7 +564,7 @@ FIXED_NEVER_USERS=root # Cyrus SASL library installed before trying to build Exim, and you probably # want to uncomment the following line: @@ -191,7 +191,7 @@ #------------------------------------------------------------------------------ -@@ -527,7 +527,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -593,7 +593,7 @@ HEADERS_CHARSET="ISO-8859-1" # the Sieve filter support. For those OS where iconv() is known to be installed # as standard, the file in OS/Makefile-xxxx contains # @@ -200,7 +200,7 @@ # # If you are not using one of those systems, but have installed iconv(), you # need to uncomment that line above. In some cases, you may find that iconv() -@@ -536,7 +536,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -602,7 +602,7 @@ HEADERS_CHARSET="ISO-8859-1" # # HAVE_ICONV=yes # CFLAGS=-O -I/usr/local/include @@ -209,7 +209,7 @@ # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -589,10 +589,10 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -655,10 +655,10 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -222,7 +222,7 @@ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -611,7 +611,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -677,7 +677,7 @@ HEADERS_CHARSET="ISO-8859-1" # with all your other libraries. If they are in a special directory, you may # need something like @@ -231,7 +231,7 @@ # or # TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -@@ -619,7 +619,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -685,7 +685,7 @@ HEADERS_CHARSET="ISO-8859-1" # auxiliary programs. If the include files are not in a standard place, you can # set TLS_INCLUDE to specify where they are, for example: @@ -240,7 +240,7 @@ # or # TLS_INCLUDE=-I/opt/gnu/include -@@ -643,7 +643,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -709,7 +709,7 @@ HEADERS_CHARSET="ISO-8859-1" # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. @@ -249,7 +249,7 @@ #------------------------------------------------------------------------------ -@@ -656,7 +656,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -722,7 +722,7 @@ HEADERS_CHARSET="ISO-8859-1" # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: @@ -258,7 +258,7 @@ # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -705,7 +705,7 @@ EXICYCLOG_MAX=10 +@@ -771,7 +771,7 @@ EXICYCLOG_MAX=10 # files. Both the name of the command and the suffix that it adds to files # need to be defined here. See also the EXICYCLOG_MAX configuration. @@ -267,7 +267,7 @@ COMPRESS_SUFFIX=gz -@@ -713,7 +713,7 @@ COMPRESS_SUFFIX=gz +@@ -779,7 +779,7 @@ COMPRESS_SUFFIX=gz # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. @@ -276,7 +276,7 @@ #------------------------------------------------------------------------------ -@@ -732,7 +732,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -798,7 +798,7 @@ ZCAT_COMMAND=/usr/bin/zcat # that the local_scan API is made available by the linker. You may also need # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. @@ -285,7 +285,7 @@ #------------------------------------------------------------------------------ -@@ -742,7 +742,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -808,7 +808,7 @@ ZCAT_COMMAND=/usr/bin/zcat # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -294,7 +294,7 @@ # You probably need to add -lpam to EXTRALIBS, and in some releases of # GNU/Linux -ldl is also needed. -@@ -839,7 +839,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -912,7 +912,7 @@ ZCAT_COMMAND=/usr/bin/zcat # (the value doesn't matter), the symbolic link is not created or moved. You # will then have to "turn Exim on" by setting up the link manually. @@ -303,7 +303,7 @@ #------------------------------------------------------------------------------ -@@ -851,7 +851,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat # aliases). The following setting can be changed to specify a different # location for the system alias file. Modified: csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch =================================================================== --- csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch 2011-05-18 23:39:54 UTC (rev 14612) +++ csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch 2011-05-18 23:54:47 UTC (rev 14613) @@ -1,6 +1,6 @@ -From 3cc753695b92fae90252d3beb8f83dfd1133f6aa Mon Sep 17 00:00:00 2001 +From fe5dfda4e0b20be76a30dfe20a4bee8265bd00f6 Mon Sep 17 00:00:00 2001 From: Ben Walton <bwalton at opencsw.org> -Date: Tue, 14 Dec 2010 04:37:19 +0100 +Date: Thu, 19 May 2011 01:51:46 +0200 Subject: [PATCH] Force Compiler and a few compilation options We need to force the use of compiler and add a few extra CFLAGS and @@ -12,11 +12,11 @@ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Local/Makefile b/Local/Makefile -index 6ba1bf8..60f0199 100644 +index e0e9e36..68bd009 100644 --- a/Local/Makefile +++ b/Local/Makefile @@ -1,5 +1,16 @@ - # $Cambridge: exim/exim-src/src/EDITME,v 1.23 2009/11/20 12:18:19 nm4 Exp $ + # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ +# -I (CSW_WORKSRC).. is needed for the SPF2 hack (to pick up patched +# SPF2 headers locally) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 02:18:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 19 May 2011 00:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14614] csw/mgar/pkg/exim/trunk/Makefile Message-ID: <E1QMqwI-00084d-2p@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14614 http://gar.svn.sourceforge.net/gar/?rev=14614&view=rev Author: bdwalton Date: 2011-05-19 00:18:05 +0000 (Thu, 19 May 2011) Log Message: ----------- exim/trunk: ensure we create the spool directory and have it owned by exim (modify existing prototype modifier); mantis id 3492 Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-18 23:54:47 UTC (rev 14613) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-19 00:18:05 UTC (rev 14614) @@ -78,13 +78,14 @@ CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/log/exim CHECKPKG_OVERRIDES_CSWexim += file-with-bad-content|/usr/local|root/opt/csw/sbin/exim -PROTOTYPE_MODIFIERS = eximsuid eximlogs +PROTOTYPE_MODIFIERS = eximsuid eximowned PROTOTYPE_PERMS_eximsuid = 4755 PROTOTYPE_FILES_eximsuid = $(sbindir)/exim -PROTOTYPE_USER_eximlogs = exim -PROTOTYPE_GROUP_eximlogs = exim -PROTOTYPE_PERMS_eximlogs = 750 -PROTOTYPE_FILES_eximlogs = $(prefix)/var/log/exim +PROTOTYPE_CLASS_eximowned = ugfiles +PROTOTYPE_USER_eximowned = exim +PROTOTYPE_GROUP_eximowned = exim +PROTOTYPE_PERMS_eximowned = 750 +PROTOTYPE_FILES_eximowned = $(prefix)/var/log/exim $(prefix)/var/spool/exim include gar/category.mk @@ -120,6 +121,7 @@ (cd $(DESTDIR); mkdir -p etc/opt/csw/init.d; \ cp $(abspath $(FILEDIR)/cswexim) etc/opt/csw/init.d ) mkdir -p $(DESTDIR)$(prefix)/share/doc/exim + mkdir -p $(DESTDIR)$(prefix)/var/spool/exim cp -p files/README.CSW $(DESTDIR)$(prefix)/share/doc/exim/README.CSW cp -p files/exim-env.sh $(DESTDIR)$(prefix)/etc/exim/exim-env.sh.CSW (cd $(WORKSRC)/doc; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 02:24:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 19 May 2011 00:24:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14615] csw/mgar/pkg/exim/trunk/Makefile Message-ID: <E1QMr2M-00052u-3l@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14615 http://gar.svn.sourceforge.net/gar/?rev=14615&view=rev Author: bdwalton Date: 2011-05-19 00:24:21 +0000 (Thu, 19 May 2011) Log Message: ----------- exim/trunk: override two more discourage paths until i can do the migration Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-19 00:18:05 UTC (rev 14614) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-19 00:24:21 UTC (rev 14615) @@ -76,6 +76,8 @@ CHECKPKG_OVERRIDES_CSWexim += surplus-dependency|CSWgzip CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/log CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/log/exim +CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/spool +CHECKPKG_OVERRIDES_CSWexim += discouraged-path-in-pkgmap|/opt/csw/var/spool/exim CHECKPKG_OVERRIDES_CSWexim += file-with-bad-content|/usr/local|root/opt/csw/sbin/exim PROTOTYPE_MODIFIERS = eximsuid eximowned This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu May 19 02:25:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 19 May 2011 00:25:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14616] csw/mgar/pkg/exim/trunk/Makefile Message-ID: <E1QMr33-0008AU-LH@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14616 http://gar.svn.sourceforge.net/gar/?rev=14616&view=rev Author: bdwalton Date: 2011-05-19 00:25:05 +0000 (Thu, 19 May 2011) Log Message: ----------- exim/trunk: update libspf2 runtime dep Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-19 00:24:21 UTC (rev 14615) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-19 00:25:05 UTC (rev 14616) @@ -28,7 +28,7 @@ BUILD_DEP_PKGS = CSWlibspf2-dev RUNTIME_DEP_PKGS_CSWexim = CSWiconv CSWoldaprt CSWosslrt CSWsasl -RUNTIME_DEP_PKGS_CSWexim += CSWmysql5rt CSWlibpq CSWlibspf2 +RUNTIME_DEP_PKGS_CSWexim += CSWmysql5rt CSWlibpq CSWlibspf2-2 RUNTIME_DEP_PKGS_CSWexim += CSWgzip CSWgzipextras RUNTIME_DEP_PKGS_CSWexim += CSWlibpcre0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 19 13:28:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 May 2011 11:28:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14617] csw/mgar/pkg/synergy/trunk Message-ID: <E1QN1Oo-0002Im-E6@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14617 http://gar.svn.sourceforge.net/gar/?rev=14617&view=rev Author: dmichelsen Date: 2011-05-19 11:28:14 +0000 (Thu, 19 May 2011) Log Message: ----------- synergy: Move to mGAR v2, new defaults, adjustments, now uses cmake and does not compile Modified Paths: -------------- csw/mgar/pkg/synergy/trunk/Makefile csw/mgar/pkg/synergy/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/synergy/trunk/files/CSWsynergy.gspec Property Changed: ---------------- csw/mgar/pkg/synergy/trunk/ Property changes on: csw/mgar/pkg/synergy/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/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2011-05-19 00:25:05 UTC (rev 14616) +++ csw/mgar/pkg/synergy/trunk/Makefile 2011-05-19 11:28:14 UTC (rev 14617) @@ -11,7 +11,7 @@ # "../../lib/server/CConfig.h", line 145: Error: A declaration was expected instead of ">" # NAME = synergy -VERSION = 1.3.4 +VERSION = 1.4.2 CATEGORIES = apps DESCRIPTION = Software-based TCP/IP "KVM" switch @@ -22,15 +22,11 @@ on their desk since each system uses its own monitor(s). endef -VENDOR_URL = http://synergy-foss.org/ -MASTER_SITES = $(GOOGLE_MIRROR) -GOOGLE_PROJECT = synergy-plus -DISTFILES = synergy-plus-$(VERSION).tar.gz -DISTNAME = synergy-plus-$(VERSION) +MASTER_SITES = $(GOOGLE_MIRROR) +DISTNAME = synergy-$(VERSION)-Source +DISTFILES += $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = http://synergy-foss.org/pm/projects/synergy/tabs/download -UFILES_REGEX = synergy-plus-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://synergy-foss.org/ # Was required with synergy 1.3.1, still required? # Adjust code so that it compiles with Sun Studio Compiler @@ -42,17 +38,23 @@ # http://sf.net/tracker/index.php?func=detail&aid=2359359&group_id=59275&atid=490469 #PATCHFILES += link-xlibs.diff -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw -CONFIGURE_ARGS += --x-includes=/usr/openwin/include -CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib +# TEST_SCRIPTS = -TEST_SCRIPTS = - #pre-configure: # cd $(WORKSRC) && autoreconf # @$(MAKECOOKIE) +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom + +include gar/category.mk + +configure-custom: + cd $(WORKSRC) && ./hm.sh configure + +build-custom: + cd $(WORKSRC) && ./hm.sh build + post-install: ginstall -d $(DESTDIR)$(sysconfdir) ginstall -d $(DESTDIR)$(docdir)/$(NAME)/images @@ -69,5 +71,3 @@ $(WORKSRC)/doc/images/* \ $(DESTDIR)$(docdir)/$(NAME)/images @$(MAKECOOKIE) - -include gar/category.mk Modified: csw/mgar/pkg/synergy/trunk/checksums =================================================================== --- csw/mgar/pkg/synergy/trunk/checksums 2011-05-19 00:25:05 UTC (rev 14616) +++ csw/mgar/pkg/synergy/trunk/checksums 2011-05-19 11:28:14 UTC (rev 14617) @@ -1 +1 @@ -2c565afe5f920d363eef38dd97449b73 synergy-plus-1.3.4.tar.gz +cd4e18a206d4c326de7b728256350d87 synergy-1.4.2-Source.tar.gz Deleted: csw/mgar/pkg/synergy/trunk/files/CSWsynergy.gspec =================================================================== --- csw/mgar/pkg/synergy/trunk/files/CSWsynergy.gspec 2011-05-19 00:25:05 UTC (rev 14616) +++ csw/mgar/pkg/synergy/trunk/files/CSWsynergy.gspec 2011-05-19 11:28:14 UTC (rev 14617) @@ -1,4 +0,0 @@ -%var bitname synergy -%var pkgname CSWsynergy -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 19 15:20:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 May 2011 13:20:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14618] csw/mgar/pkg/libsmi/trunk/Makefile Message-ID: <E1QN39t-0006dD-Un@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14618 http://gar.svn.sourceforge.net/gar/?rev=14618&view=rev Author: dmichelsen Date: 2011-05-19 13:20:57 +0000 (Thu, 19 May 2011) Log Message: ----------- libsmi: Split packages Modified Paths: -------------- csw/mgar/pkg/libsmi/trunk/Makefile Modified: csw/mgar/pkg/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2011-05-19 11:28:14 UTC (rev 14617) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2011-05-19 13:20:57 UTC (rev 14618) @@ -12,37 +12,48 @@ endef MASTER_SITES = ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# 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.ibr.cs.tu-bs.de/projects/libsmi/ -PACKAGES = CSWlibsmi CSWlibsmimibs +PACKAGES += CSWlibsmi2 +SPKG_DESC_CSWlibsmi2 = Library to access SMI MIB module definitions, libsmi.so.2 +PKGFILES_CSWlibsmi2 = $(call pkgfiles_lib,libsmi.so.2) +RUNTIME_DEP_PKGS_CSWlibsmi = CSWlibsmi-mibs +OBSOLETED_BY_CSWlibsmi2 = CSWlibsmi -CATALOGNAME_CSWlibsmi = libsmi -CATALOGNAME_CSWlibsmimibs = libsmi_mibs +PACKAGES += CSWlibsmi-dev +SPKG_DESC_CSWlibsmi-dev = Development files for libsmi.so.2 +PKGFILES_CSWlibsmi-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsmi-dev = CSWlibsmi2 -SPKG_DESC_CSWlibsmi = Library to access SMI MIB module definitions -SPKG_DESC_CSWlibsmimibs = SMI MIB definitions +PACKAGES += CSWlibsmi-utils +SPKG_DESC_CSWlibsmi-utils = Utility programs to access MIBs +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibsmi-utils += CSWlibsmi2 +RUNTIME_DEP_PKGS_CSWlibsmi-utils += CSWlibsmi-mibs +CHECKPKG_OVERRIDES_CSWlibsmi-utils += surplus-dependency|CSWlibsmi-mibs -SPKG_SOURCEURL = http://www.ibr.cs.tu-bs.de/projects/libsmi/ +PACKAGES += CSWlibsmi-mibs +SPKG_DESC_CSWlibsmi-mibs = SMI MIB definitions +PKGFILES_CSWlibsmi-mibs = $(sharedstatedir)/mibs/.* +PKGFILES_CSWlibsmi-mibs += $(sharedstatedir)/pibs/.* +ARCHALL_CSWlibsmi-mibs = 1 +OBSOLETED_BY_CSWlibsmi-mibs = CSWlibsmimibs -RUNTIME_DEP_PKGS_CSWlibsmi = CSWlibsmimibs - BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs EXTRA_CPPFLAGS_isa-i386 = -Dfabsf=fabs EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS_isa-$(ISA)) -MERGE_DIRS_isa-extra = $(libdir) +# Some tests fail, however, these are only whitespace and newline differences +SKIPTEST ?= 1 -ARCHALL_CSWlibsmimibs = 1 +# These are just examples +CHECKPKG_OVERRIDES_CSWlibsmi-utils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smicache.1 +CHECKPKG_OVERRIDES_CSWlibsmi-utils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smixlate.1 +CHECKPKG_OVERRIDES_CSWlibsmi-utils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smistrip.1 -PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* -PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 19 15:24:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 May 2011 13:24:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14619] csw/mgar/pkg/netsnmp/trunk Message-ID: <E1QN3Di-0003nj-Uh@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14619 http://gar.svn.sourceforge.net/gar/?rev=14619&view=rev Author: dmichelsen Date: 2011-05-19 13:24:54 +0000 (Thu, 19 May 2011) Log Message: ----------- netsnmp: Work towards 5.6.1 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2011-05-19 13:20:57 UTC (rev 14618) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2011-05-19 13:24:54 UTC (rev 14619) @@ -1,5 +1,5 @@ NAME = netsnmp -VERSION = 5.5 +VERSION = 5.6.1 CATEGORIES = apps DESCRIPTION = A suite of applications used to implement SNMP @@ -20,20 +20,27 @@ # Patch for python module PATCHFILES += Makefile.in.diff -SPKG_SOURCEURL = http://www.net-snmp.org/ +VENDOR_URL = http://www.net-snmp.org/ BUILD_DEP_PKGS = CSWpysetuptools RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWpython -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes +# The -I/opt/csw/include pulls in installed version before built version and breaks testsuite +CPPFLAGS = +EXTRA_CFLAGS = $(INCLUDE_FLAGS) + +# CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes +CONFIGURE_ARGS_mm-32 = --enable-embedded-perl --with-perl-modules=yes +# Disable MIBs due to LARGEFILE issue +CONFIGURE_ARGS_mm-32 += --with-out-mib-modules="ucd_snmp host mibII/ipv6 ucd_snmp/memory ucd_snmp/memory_solaris2 ucd_snmp/proc host/hr_swrun host/hr_storage" +#CONFIGURE_ARGS_mm-32 += --disable-perl-cc-checks +CONFIGURE_ARGS_mm-32 += enable_perl_cc_checks=no + +enable_perl_cc_checks = no +EXTRA_CONFIGURE_EXPORTS = enable_perl_cc_checks + CONFIGURE_ARGS_mm-32 += --with-python-modules=yes CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules CONFIGURE_ARGS_mm-64 += --without-python-modules @@ -50,14 +57,19 @@ CONFIGURE_ARGS += --with-transports="UDP TCP Unix" CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) + +# TBD: Make alternatives +# - with embedded Perl and disabled modules +# --with-mib-modules="smux mibII/mta_sendmail" +# --with-defaults --enable-ipv6 --with-out-mib-modules="ucd_snmp host mibII/ipv6 ucd_snmp/memory ucd_snmp/memory_solaris2 ucd_snmp/proc host/hr_swrun host/hr_storage" --with-perl-modules --enable-embedded-perl --disable-perl-cc-checks --enable-shared +# - without embedded Perl and all modules + # Disable testsuite until this has been fixed or /tmp will fill up: # https://sourceforge.net/tracker/?func=detail&aid=3006962&group_id=12694&atid=112694 SKIPTEST ?= 1 EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod -MERGE_DIRS_isa-extra = $(libdir) - # Overriding specific libs is not possible right now. Refine when finished. # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found @@ -65,20 +77,20 @@ include gar/category.mk -post-install-isa-sparcv8: - ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) - ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 - @$(MAKECOOKIE) +#post-install-isa-sparcv8: +# ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) +# ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 +# ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 +# ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 +# ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 +# ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 +# @$(MAKECOOKIE) -post-install-isa-i386: - ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) - ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 - ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 - ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 - ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 - @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 - @$(MAKECOOKIE) +#post-install-isa-i386: +# ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -) +# ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 +# ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10 +# ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10 +# ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10 +# @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2011-05-19 13:20:57 UTC (rev 14618) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2011-05-19 13:24:54 UTC (rev 14619) @@ -1,3 +1 @@ -5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff -5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz -c64f189decc111ba83c28f135bf96a9b perl_makefiles.diff +b4e30ead5783b0bb1d280172c6095ea4 net-snmp-5.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 19 17:00:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 May 2011 15:00:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14620] csw/mgar/pkg/libtheora/trunk Message-ID: <E1QN4iB-0005aK-OQ@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14620 http://gar.svn.sourceforge.net/gar/?rev=14620&view=rev Author: dmichelsen Date: 2011-05-19 15:00:27 +0000 (Thu, 19 May 2011) Log Message: ----------- libtheora: Split packages Modified Paths: -------------- csw/mgar/pkg/libtheora/trunk/Makefile csw/mgar/pkg/libtheora/trunk/checksums Modified: csw/mgar/pkg/libtheora/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtheora/trunk/Makefile 2011-05-19 13:24:54 UTC (rev 14619) +++ csw/mgar/pkg/libtheora/trunk/Makefile 2011-05-19 15:00:27 UTC (rev 14620) @@ -11,27 +11,43 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/theora/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(NAME)-$(VERSION).tar.xz -SPKG_SOURCEURL = http://www.theora.org +VENDOR_URL = http://www.theora.org BUILD_DEP_PKGS = CSWtransfig -RUNTIME_DEP_PKGS = CSWlibogg -PACKAGES = CSWtheora -CATALOGNAME = libtheora +PACKAGES += CSWlibtheora0 +PKGFILES_CSWlibtheora0 += $(call pkgfiles_lib,libtheora.so.0) +SPKG_DESC_CSWlibtheora0 += Theora video codec support library, libtheora.so.0 +RUNTIME_DEP_PKGS_CSWlibtheora0 += CSWlibogg0 +OBSOLETED_BY_CSWlibtheora0 = CSWtheora +CATALOGNAME_CSWtheora = libtheora_stub -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibtheoradec1 +PKGFILES_CSWlibtheoradec1 += $(call pkgfiles_lib,libtheoradec.so.1) +SPKG_DESC_CSWlibtheoradec1 += Theora video codec support library, libtheoradec.so.1 +OBSOLETED_BY_CSWlibtheora0 = CSWtheora +PACKAGES += CSWlibtheoraenc1 +PKGFILES_CSWlibtheoraenc1 += $(call pkgfiles_lib,libtheoraenc.so.1) +SPKG_DESC_CSWlibtheoraenc1 += Theora video codec support library, libtheoraenc.so.1 +RUNTIME_DEP_PKGS_CSWlibtheoraenc1 += CSWlibogg0 +OBSOLETED_BY_CSWlibtheora0 = CSWtheora + +PACKAGES += CSWlibtheora-dev +SPKG_DESC_CSWlibtheora-dev = Development files for libtheora.so.0, libtheoradec.so.1 and libtheoraenc.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoraenc1 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-examples CONFIGURE_ARGS += --disable-asm -TEST_TARGET = check - EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),' include gar/category.mk Modified: csw/mgar/pkg/libtheora/trunk/checksums =================================================================== --- csw/mgar/pkg/libtheora/trunk/checksums 2011-05-19 13:24:54 UTC (rev 14619) +++ csw/mgar/pkg/libtheora/trunk/checksums 2011-05-19 15:00:27 UTC (rev 14620) @@ -1 +1 @@ -292ab65cedd5021d6b7ddd117e07cd8e download/libtheora-1.1.1.tar.bz2 +9eeabf1ad65b7f41533854a59f7a716d libtheora-1.1.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 19 17:06:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 May 2011 15:06:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14621] csw/mgar/pkg/libshout/trunk/Makefile Message-ID: <E1QN4nz-0005ge-RY@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14621 http://gar.svn.sourceforge.net/gar/?rev=14621&view=rev Author: dmichelsen Date: 2011-05-19 15:06:27 +0000 (Thu, 19 May 2011) Log Message: ----------- libshout: Split packages and update to new defaults Modified Paths: -------------- csw/mgar/pkg/libshout/trunk/Makefile Modified: csw/mgar/pkg/libshout/trunk/Makefile =================================================================== --- csw/mgar/pkg/libshout/trunk/Makefile 2011-05-19 15:00:27 UTC (rev 14620) +++ csw/mgar/pkg/libshout/trunk/Makefile 2011-05-19 15:06:27 UTC (rev 14621) @@ -7,22 +7,30 @@ endef MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibshout3 +SPKG_DESC_CSWlibshout3 = Icecast library, libshout.so.3 +PKGFILES_CSWlibshout3 = $(call pkgfiles_lib,libshout.so.3) +RUNTIME_DEP_PKGS_CSWlibshout3 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibshout3 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibshout3 += CSWlibtheora0 +OBSOLETED_BY_CSWlibshout3 = CSWlibshout -RUNTIME_DEP_PKGS = CSWlibogg CSWtheora CSWvorbis -PRERQUISITE_PKGS = $(RUNTIME_DEP_PKGS) +PACKAGES += CSWlibshout-dev +SPKG_DESC_CSWlibshout-dev = Development files for libshout.so.3 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibshout-dev = CSWlibshout3 +BUILD64 = 1 + # GAR default: -xO3 -xarch=v8 -I/opt/csw/include # Configure hardwired: -xO4 -fast -w -fsimple -native -xcg92 +BUILD_ARGS = CFLAGS="-xO4 -fsimple -native -xcg92 $(filter -m% -xarch=% -I%,$(CFLAGS))" -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +include gar/category.mk -BUILD_ARGS = CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 $(filter -xarch=% -I%,$(CFLAGS))" - -TEST_TARGET = check - -include gar/category.mk +post-extract-modulated: + perl -pi \ + -e 's,/usr/local,$(prefix),' \ + $(WORKSRC)/m4/shout.m4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu May 19 19:24:39 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 19 May 2011 17:24:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14622] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QN6xj-0005k2-Ur@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14622 http://gar.svn.sourceforge.net/gar/?rev=14622&view=rev Author: ellson Date: 2011-05-19 17:24:39 +0000 (Thu, 19 May 2011) Log Message: ----------- graphviz-2.28 update Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 15:06:27 UTC (rev 14621) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 17:24:39 UTC (rev 14622) @@ -1,5 +1,5 @@ NAME = graphviz -VERSION = 2.26.3 +VERSION = 2.28.0 CATEGORIES = utils DESCRIPTION = Graph visualization tools Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 15:06:27 UTC (rev 14621) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 17:24:39 UTC (rev 14622) @@ -5,4 +5,4 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall 440058cc9beafc050b858fbf93242eee Draw.c.diff bb58d5086e1aaa2519a7184b9ef1748f configure.patch -6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz +8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu May 19 19:44:14 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 19 May 2011 17:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14623] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QN7Gg-0006N6-GK@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14623 http://gar.svn.sourceforge.net/gar/?rev=14623&view=rev Author: ellson Date: 2011-05-19 17:44:14 +0000 (Thu, 19 May 2011) Log Message: ----------- Draw.c.diff was upstreamed Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 17:24:39 UTC (rev 14622) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 17:44:14 UTC (rev 14623) @@ -3,6 +3,5 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postuninstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall -440058cc9beafc050b858fbf93242eee Draw.c.diff bb58d5086e1aaa2519a7184b9ef1748f configure.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz Deleted: csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff 2011-05-19 17:24:39 UTC (rev 14622) +++ csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff 2011-05-19 17:44:14 UTC (rev 14623) @@ -1,25 +0,0 @@ ---- graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c.orig 2010-01-26 13:27:07.000000000 -0500 -+++ graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c 2010-01-26 13:27:39.000000000 -0500 -@@ -1,4 +1,4 @@ --/* $Id: Draw.c,v 1.8 2009/10/13 14:20:29 ellson Exp $ $Revision: 1.8 $ */ -+/* $Id: Draw.c,v 1.9 2010/01/26 18:24:35 ellson Exp $ $Revision: 1.9 $ */ - /* vim:set shiftwidth=4 ts=8: */ - - /********************************************************** -@@ -43,8 +43,16 @@ - * erik at sra.co.jp - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - #include <stdio.h> -+#ifdef HAVE_STDINT_H - #include <stdint.h> -+#endif -+#ifdef HAVE_INTTYPES_H -+#include <inttypes.h> -+#endif - #include "SFinternal.h" - #include "xstat.h" - #include <X11/StringDefs.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu May 19 19:46:19 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 19 May 2011 17:46:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14624] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QN7Ih-0006Ra-8F@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14624 http://gar.svn.sourceforge.net/gar/?rev=14624&view=rev Author: ellson Date: 2011-05-19 17:46:18 +0000 (Thu, 19 May 2011) Log Message: ----------- also Makefile change for upstreamed diff Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 17:44:14 UTC (rev 14623) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 17:46:18 UTC (rev 14624) @@ -15,7 +15,6 @@ ENABLE_CHECK = 0 PATCHFILES += configure.patch -PATCHFILES += Draw.c.diff PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Fri May 20 00:24:58 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 19 May 2011 22:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14625] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QNBeM-0006TH-0l@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14625 http://gar.svn.sourceforge.net/gar/?rev=14625&view=rev Author: ellson Date: 2011-05-19 22:24:57 +0000 (Thu, 19 May 2011) Log Message: ----------- attempt to fix weird grep problem Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 17:46:18 UTC (rev 14624) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-19 22:24:57 UTC (rev 14625) @@ -15,6 +15,7 @@ ENABLE_CHECK = 0 PATCHFILES += configure.patch +PATCHFILES += Makefile.am.patch PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 17:46:18 UTC (rev 14624) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-19 22:24:57 UTC (rev 14625) @@ -4,4 +4,5 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall bb58d5086e1aaa2519a7184b9ef1748f configure.patch +85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz Added: csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2011-05-19 22:24:57 UTC (rev 14625) @@ -0,0 +1,25 @@ +--- graphviz2/Makefile.am.orig 2011-05-19 16:37:11.967464147 -0400 ++++ graphviz2/Makefile.am 2011-05-19 16:16:07.582870659 -0400 +@@ -12,7 +12,7 @@ + txt_DATA = $(txt) + html_DATA = $(html) + +-pkginclude_HEADERS = graphviz_version.h ++pkginclude_HEADERS = $(top_builddir)/graphviz_version.h + + man_MANS = graphviz.7 + +@@ -28,10 +28,10 @@ + # rm -f ToPAS + # find $(distdir) -type f -exec md5sum {} >>ToPAS \; + +-BUILT_SOURCES = graphviz_version.h ++BUILT_SOURCES = $(top_builddir)/graphviz_version.h + +-graphviz_version.h: config.h +- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h ++$(top_builddir)/graphviz_version.h: config.h ++ -$(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h + + EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ + autogen.sh config/depcomp config/config.rpath \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 20 09:46:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 May 2011 07:46:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14626] csw/mgar/gar/v2/lib/python Message-ID: <E1QNKPt-0005hy-UC@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14626 http://gar.svn.sourceforge.net/gar/?rev=14626&view=rev Author: wahwah Date: 2011-05-20 07:46:37 +0000 (Fri, 20 May 2011) Log Message: ----------- checkpkg: A check for OPENCSW_REPOSITORY A check that OPENCSW_REPOSITORY is in pkginfo, and that it does not contain the "uncommitted" tag. Original discussion: http://lists.opencsw.org/pipermail/pkgsubmissions/2011-May/002883.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-05-19 22:24:57 UTC (rev 14625) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-05-20 07:46:37 UTC (rev 14626) @@ -1272,3 +1272,14 @@ def CheckLinkableSoFileMustBeAsymlink( pkg_data, error_mgr, logger, messenger): pass + + +def CheckPkginfoOpencswRepository( + pkg_data, error_mgr, logger, messenger): + repotag = "OPENCSW_REPOSITORY" + pkginfo = pkg_data["pkginfo"] + if repotag not in pkginfo: + error_mgr.ReportError("pkginfo-opencsw-repository-missing") + return + if "UNCOMMITTED" in pkginfo[repotag]: + error_mgr.ReportError("pkginfo-opencsw-repository-uncommitted") Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-05-19 22:24:57 UTC (rev 14625) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-05-20 07:46:37 UTC (rev 14626) @@ -1715,5 +1715,25 @@ self.RunCheckpkgTest(self.CheckpkgTest2) +class TestCheckCatalognameMatchesPkgname(CheckpkgUnitTestHelper, + unittest.TestCase): + FUNCTION_NAME = 'CheckPkginfoOpencswRepository' + + def CheckpkgTest(self): + self.pkg_data = copy.deepcopy(tree_stats[0]) + del self.pkg_data["pkginfo"]["OPENCSW_REPOSITORY"] + self.error_mgr_mock.ReportError('pkginfo-opencsw-repository-missing') + + def CheckpkgTest2(self): + self.pkg_data = copy.deepcopy(tree_stats[0]) + self.pkg_data["pkginfo"]["OPENCSW_REPOSITORY"] = ( + "https://gar.svn.sourceforge.net/svnroot/gar/" + "csw/mgar/pkg/puppet/trunk at UNCOMMITTED") + self.error_mgr_mock.ReportError('pkginfo-opencsw-repository-uncommitted') + + def testTwo(self): + self.RunCheckpkgTest(self.CheckpkgTest2) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 20 14:11:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 May 2011 12:11:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14627] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: <E1QNOXz-00024h-Vu@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14627 http://gar.svn.sourceforge.net/gar/?rev=14627&view=rev Author: dmichelsen Date: 2011-05-20 12:11:15 +0000 (Fri, 20 May 2011) Log Message: ----------- netsnmp: Enable embedded Perl for 64 bit only Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2011-05-20 07:46:37 UTC (rev 14626) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2011-05-20 12:11:15 UTC (rev 14627) @@ -1,3 +1,9 @@ +# TBD before release: +# - compile 64 bit version with embedded perl, this should resolve the largefile issue +# - reenable tcpwrappers for both 32 and 64 bit +# - reenable python bindings +# + NAME = netsnmp VERSION = 5.6.1 CATEGORIES = apps @@ -31,18 +37,15 @@ CPPFLAGS = EXTRA_CFLAGS = $(INCLUDE_FLAGS) -# CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes -CONFIGURE_ARGS_mm-32 = --enable-embedded-perl --with-perl-modules=yes -# Disable MIBs due to LARGEFILE issue -CONFIGURE_ARGS_mm-32 += --with-out-mib-modules="ucd_snmp host mibII/ipv6 ucd_snmp/memory ucd_snmp/memory_solaris2 ucd_snmp/proc host/hr_swrun host/hr_storage" -#CONFIGURE_ARGS_mm-32 += --disable-perl-cc-checks -CONFIGURE_ARGS_mm-32 += enable_perl_cc_checks=no +CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes +# Enable Perl for 64 bit later +# CONFIGURE_ARGS_mm-32 = --enable-embedded-perl --with-perl-modules=yes -enable_perl_cc_checks = no -EXTRA_CONFIGURE_EXPORTS = enable_perl_cc_checks +# This throws compile error, investigate later +# CONFIGURE_ARGS_mm-32 += --with-python-modules=yes -CONFIGURE_ARGS_mm-32 += --with-python-modules=yes -CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules +# CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules +CONFIGURE_ARGS_mm-64 = --enable-embedded-perl --with-perl-modules CONFIGURE_ARGS_mm-64 += --without-python-modules CONFIGURE_ARGS = $(DIRPATHS) @@ -52,11 +55,15 @@ CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp CONFIGURE_ARGS += --with-mib-modules="ucd-snmp/diskio agentx mibII/mta_sendmail" -CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib +# Disable for now +# CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-transports="UDP TCP Unix" CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) +# Solaris /bin/bash does not allow empty lists in "for i in ; do echo; done" +CONFIG_SHELL = /opt/csw/bin/bash +EXTRA_CONFIGURE_ENV = CONFIG_SHELL # TBD: Make alternatives # - with embedded Perl and disabled modules @@ -66,10 +73,14 @@ # Disable testsuite until this has been fixed or /tmp will fill up: # https://sourceforge.net/tracker/?func=detail&aid=3006962&group_id=12694&atid=112694 -SKIPTEST ?= 1 +# SKIPTEST ?= 1 +TEST_TARGET = test + EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) + # Overriding specific libs is not possible right now. Refine when finished. # CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Fri May 20 16:26:39 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Fri, 20 May 2011 14:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14628] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QNQf1-0008PN-UE@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14628 http://gar.svn.sourceforge.net/gar/?rev=14628&view=rev Author: ellson Date: 2011-05-20 14:26:39 +0000 (Fri, 20 May 2011) Log Message: ----------- patch for miissing log2() Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-20 12:11:15 UTC (rev 14627) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-20 14:26:39 UTC (rev 14628) @@ -16,6 +16,7 @@ PATCHFILES += configure.patch PATCHFILES += Makefile.am.patch +PATCHFILES += trapezoid.c.patch PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-20 12:11:15 UTC (rev 14627) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-20 14:26:39 UTC (rev 14628) @@ -5,4 +5,5 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall bb58d5086e1aaa2519a7184b9ef1748f configure.patch 85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch +5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz Added: csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch 2011-05-20 14:26:39 UTC (rev 14628) @@ -0,0 +1,13 @@ +--- graphviz2/lib/ortho/trapezoid.c.orig 2011-05-20 10:21:30.053193399 -0400 ++++ graphviz2/lib/ortho/trapezoid.c 2011-05-20 10:15:18.261136653 -0400 +@@ -28,6 +28,10 @@ + + #ifdef WIN32 + #define log2(x) (log(x)/log(2)) ++#else ++#ifndef HAVE_LOG2 ++#define log2(x) (log(x)/log(2)) ++#endif + #endif + + /* Node types */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Fri May 20 17:13:18 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Fri, 20 May 2011 15:13:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14629] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QNROA-0002iM-6h@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14629 http://gar.svn.sourceforge.net/gar/?rev=14629&view=rev Author: ellson Date: 2011-05-20 15:13:17 +0000 (Fri, 20 May 2011) Log Message: ----------- add post_process.c.patch Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-20 14:26:39 UTC (rev 14628) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-20 15:13:17 UTC (rev 14629) @@ -17,6 +17,7 @@ PATCHFILES += configure.patch PATCHFILES += Makefile.am.patch PATCHFILES += trapezoid.c.patch +PATCHFILES += post_process.c.patch PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-20 14:26:39 UTC (rev 14628) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-20 15:13:17 UTC (rev 14629) @@ -6,4 +6,5 @@ bb58d5086e1aaa2519a7184b9ef1748f configure.patch 85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch +31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Fri May 20 17:13:48 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Fri, 20 May 2011 15:13:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14630] csw/mgar/pkg/graphviz/trunk/files/post_process.c. patch Message-ID: <E1QNROe-0002it-Lk@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14630 http://gar.svn.sourceforge.net/gar/?rev=14630&view=rev Author: ellson Date: 2011-05-20 15:13:48 +0000 (Fri, 20 May 2011) Log Message: ----------- really add post_process.c.patch Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch Added: csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch 2011-05-20 15:13:48 UTC (rev 14630) @@ -0,0 +1,9 @@ +--- graphviz2/lib/sfdpgen/post_process.c.orig 2011-05-20 11:08:31.253933170 -0400 ++++ graphviz2/lib/sfdpgen/post_process.c 2011-05-20 11:06:43.000000000 -0400 +@@ -412,7 +412,7 @@ + + + void SparseStressMajorizationSmoother_delete(SparseStressMajorizationSmoother sm){ +- return StressMajorizationSmoother_delete(sm); ++ StressMajorizationSmoother_delete(sm); + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri May 20 20:56:31 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 20 May 2011 19:56:31 +0100 Subject: [csw-devel] SF.net SVN: gar:[14630] csw/mgar/pkg/graphviz/trunk/files/post_process.c. patch In-Reply-To: <E1QNROe-0002it-Lk@sfp-svn-3.v30.ch3.sourceforge.com> References: <E1QNROe-0002it-Lk@sfp-svn-3.v30.ch3.sourceforge.com> Message-ID: <BANLkTi=y_x9Nk0WE47_LKkhWmyTch1vKyg@mail.gmail.com> Hi John, Are you familiar with "mgar makepatch"? Maciej From ellson at users.sourceforge.net Sat May 21 00:56:31 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Fri, 20 May 2011 22:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14631] csw/mgar/pkg/swig/trunk Message-ID: <E1QNYcR-0004KO-24@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14631 http://gar.svn.sourceforge.net/gar/?rev=14631&view=rev Author: ellson Date: 2011-05-20 22:56:30 +0000 (Fri, 20 May 2011) Log Message: ----------- swig-2.0.3 upgrade Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/swig/trunk/checksums Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2011-05-20 15:13:48 UTC (rev 14630) +++ csw/mgar/pkg/swig/trunk/Makefile 2011-05-20 22:56:30 UTC (rev 14631) @@ -1,5 +1,5 @@ NAME = swig -VERSION = 1.3.40 +VERSION = 2.0.3 CATEGORIES = devel DESCRIPTION = A scripting interface generator for C/C++ code. Modified: csw/mgar/pkg/swig/trunk/checksums =================================================================== --- csw/mgar/pkg/swig/trunk/checksums 2011-05-20 15:13:48 UTC (rev 14630) +++ csw/mgar/pkg/swig/trunk/checksums 2011-05-20 22:56:30 UTC (rev 14631) @@ -1 +1 @@ -2df766c9e03e02811b1ab4bba1c7b9cc swig-1.3.40.tar.gz +e548ea3882b994c4907d6be86bef90f2 swig-2.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 21 12:54:57 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 May 2011 10:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14632] csw/mgar/pkg/swig/trunk/Makefile Message-ID: <E1QNjph-0007lp-PT@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14632 http://gar.svn.sourceforge.net/gar/?rev=14632&view=rev Author: wahwah Date: 2011-05-21 10:54:57 +0000 (Sat, 21 May 2011) Log Message: ----------- pkg/swig/trunk: Exclude files with spaces Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/swig/trunk/Makefile Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2011-05-20 22:56:30 UTC (rev 14631) +++ csw/mgar/pkg/swig/trunk/Makefile 2011-05-21 10:54:57 UTC (rev 14632) @@ -1,3 +1,5 @@ +# $Id$ + NAME = swig VERSION = 2.0.3 CATEGORIES = devel @@ -58,9 +60,12 @@ CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWpython +EXTRA_MERGE_EXCLUDE_FILES = .*test-suite/preproc_include_(d|e|f).* + include gar/category.mk post-install-modulated: install-swig-doc + @$(MAKECOOKIE) install-swig-doc: @mkdir -p $(DESTDIR)$(docdir)/$(NAME) Property changes on: csw/mgar/pkg/swig/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sat May 21 15:16:56 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 21 May 2011 13:16:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14633] csw/mgar/pkg/swig/trunk/Makefile Message-ID: <E1QNm36-0008Pd-0Y@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14633 http://gar.svn.sourceforge.net/gar/?rev=14633&view=rev Author: ellson Date: 2011-05-21 13:16:55 +0000 (Sat, 21 May 2011) Log Message: ----------- swig: add the suggested CHECKPKG_OVERRIDES_CSWswig Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2011-05-21 10:54:57 UTC (rev 14632) +++ csw/mgar/pkg/swig/trunk/Makefile 2011-05-21 13:16:55 UTC (rev 14633) @@ -32,13 +32,13 @@ LICENSE_CSWswig = LICENSE RUNTIME_DEP_PKGS = CSWzlib +RUNTIME_DEP_PKGS_CSWswig += CSWlibpcre0 #SWIG doesn't DEPEND on the languages it supports being installed # but, for the record, languages we *do* have: #DEPEND += lang/tcl lang/python lang/perl lang/guile #DEPEND += lang/ruby lang/php4 lang/ocaml #DEPEND += lang/lua - # and languages we don't have, yet: #DEPEND += lang/pike lang/chicken lang/mono lang/mzscheme @@ -56,10 +56,40 @@ TEST_TARGET = check TEST_SCRIPTS = +#SWIG doesn't DEPEND on the languages it supports being installed CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby|or|CSWruby18 CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWpython +# lots of '/usr/local' in documentation and examples +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/Makefile +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/Makefile.in +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/pike/enum/README +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/tcl/index.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/python/index.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/python/libffi/Makefile +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/ruby/index.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/test-suite/ocaml/makedebugtop +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Introduction.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Pike.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Ruby.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Scripting.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/SWIGDocumentation.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/CCache.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Perl5.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Library.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Tcl.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Java.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Python.html +CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ccache-swig.1 + +# not sure about these +CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/lib|opt/csw/bin/swig +CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/swig +CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/swig +CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/swig + +# pkgmk can't handle spaces in filenames EXTRA_MERGE_EXCLUDE_FILES = .*test-suite/preproc_include_(d|e|f).* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sat May 21 15:37:15 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 21 May 2011 13:37:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14634] csw/mgar/pkg/swig/trunk/Makefile Message-ID: <E1QNmMl-0000H8-LT@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14634 http://gar.svn.sourceforge.net/gar/?rev=14634&view=rev Author: ellson Date: 2011-05-21 13:37:15 +0000 (Sat, 21 May 2011) Log Message: ----------- swig: add RUNTIME_DEP_PKGS_CSWswig += CSWzlib Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2011-05-21 13:16:55 UTC (rev 14633) +++ csw/mgar/pkg/swig/trunk/Makefile 2011-05-21 13:37:15 UTC (rev 14634) @@ -33,6 +33,7 @@ RUNTIME_DEP_PKGS = CSWzlib RUNTIME_DEP_PKGS_CSWswig += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWswig += CSWzlib #SWIG doesn't DEPEND on the languages it supports being installed # but, for the record, languages we *do* have: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 23 13:58:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 May 2011 11:58:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14635] csw/mgar/pkg/parallel/trunk Message-ID: <E1QOTmI-0004n6-5y@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14635 http://gar.svn.sourceforge.net/gar/?rev=14635&view=rev Author: dmichelsen Date: 2011-05-23 11:58:29 +0000 (Mon, 23 May 2011) Log Message: ----------- parallel: Update to 20110522 Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-05-21 13:37:15 UTC (rev 14634) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-05-23 11:58:29 UTC (rev 14635) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20110422 +VERSION = 20110522 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-05-21 13:37:15 UTC (rev 14634) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-05-23 11:58:29 UTC (rev 14635) @@ -1 +1 @@ -3102c91feb24dba2b225e81a209af91a parallel-20110422.tar.bz2 +83c12186d740698cddb3795420d0e1f8 parallel-20110522.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 24 09:33:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 May 2011 07:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14636] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: <E1QOm75-0006RU-H3@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14636 http://gar.svn.sourceforge.net/gar/?rev=14636&view=rev Author: wahwah Date: 2011-05-24 07:33:11 +0000 (Tue, 24 May 2011) Log Message: ----------- csw-upload-pkg: Don't sort empty input Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-05-23 11:58:29 UTC (rev 14635) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-05-24 07:33:11 UTC (rev 14636) @@ -74,7 +74,9 @@ output_to_screen=True, username=None, password=None): super(Srv4Uploader, self).__init__() - self.filenames = self.SortFilenames(filenames) + if filenames: + filenames = self.SortFilenames(filenames) + self.filenames = filenames self.md5_by_filename = {} self.debug = debug self.os_release = os_release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 24 09:34:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 May 2011 07:34:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14637] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: <E1QOm84-0006Sa-TF@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14637 http://gar.svn.sourceforge.net/gar/?rev=14637&view=rev Author: wahwah Date: 2011-05-24 07:34:12 +0000 (Tue, 24 May 2011) Log Message: ----------- csw-upload-pkg: Only print to screen when asked Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-05-24 07:33:11 UTC (rev 14636) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2011-05-24 07:34:12 UTC (rev 14637) @@ -125,7 +125,8 @@ do_upload = True planned_modifications = [] metadata_by_md5 = {} - print "Processing %s file(s). Please wait." % (len(self.filenames),) + if self.output_to_screen: + print "Processing %s file(s). Please wait." % (len(self.filenames),) for filename in self.filenames: self._ImportMetadata(filename) md5_sum = self._GetFileMd5sum(filename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 24 09:34:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 May 2011 07:34:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14638] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: <E1QOm8b-0002It-Sr@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14638 http://gar.svn.sourceforge.net/gar/?rev=14638&view=rev Author: wahwah Date: 2011-05-24 07:34:45 +0000 (Tue, 24 May 2011) Log Message: ----------- submitpkg: Take file names, not catalognames Dago's requests: 1. Take file names, not catalognames as arguments. 2. Add the --force option to allow submit i386-only packages. Signed-off-by: Maciej Blizinski <maciej at opencsw.org> Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-05-24 07:34:12 UTC (rev 14637) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2011-05-24 07:34:45 UTC (rev 14638) @@ -136,13 +136,6 @@ % repr(opt_name)) usage = """%s [options] [file1 file2 ...]""" % sys.argv[0] parser = optparse.OptionParser(usage) - parser.add_option("-p", - dest="pkgnames", - help="A deprecated options. Please use --catalognames.") - parser.add_option("-c", "--catalognames", - dest="catalognames", - help="A comma-separated list of catalog names: " - "cups,cupsdevel,libcups") parser.add_option("--debug", dest="debug", default=False, action="store_true", @@ -157,21 +150,17 @@ parser.add_option("-n", "--dry-run", dest="dry_run", default=False, action="store_true", - help="") + help="Do not perform write operations") + parser.add_option("-f", "--force", + dest="force", + default=False, action="store_true", + help="Proceed even if errors are reported") (options, args) = parser.parse_args() file_names = args level = logging.INFO if options.debug: level = logging.DEBUG logging.basicConfig(level=level) - if options.pkgnames: - logging.warn("The -p option is deprecated. Please use " - "--catalognames or -c") - if options.catalognames: - options.catalognames = ",".join([options.catalognames, - options.pkgnames]) - else: - options.catalognames = options.pkgnames if config.has_option(CONFIG_RELEASE_SECTION, "release manager name"): release_mgr_name = config.get(CONFIG_RELEASE_SECTION, "release manager name") @@ -191,28 +180,17 @@ if options.package_dir: package_dir = options.package_dir staging_dir = opencsw.StagingDir(package_dir) - if options.catalognames: - catalognames = options.catalognames.split(",") - else: - catalognames = [] - if file_names: - for file_name in file_names: - base_name = os.path.basename(file_name) - if base_name != file_name: - logging.warn("Removing %s, using only %s" - % (repr(os.path.dirname(file_name)), repr(base_name))) - logging.warn("Only %s will be searched for packages." - % repr(staging_dir)) - parsed_file_name = opencsw.ParsePackageFileName(base_name) - catalognames.append(parsed_file_name["catalogname"]) + catalognames = [] + for file_name in file_names: + base_name = os.path.basename(file_name) + parsed_file_name = opencsw.ParsePackageFileName(base_name) + catalognames.append(parsed_file_name["catalogname"]) catalognames = sorted(set(catalognames)) - if not catalognames: + if not file_names: parser.print_help() - raise ConfigurationError("You need to specify a package name or names.") + raise ConfigurationError("You need to specify package file names.") - package_files = [] - for p in catalognames: - package_files.extend(staging_dir.GetLatest(p)) + package_files = file_names logging.debug("Copying files to the target host:dir") remote_package_files = [] remote_package_references = [] @@ -230,10 +208,9 @@ if error_tags: for error_tag in error_tags: print error_tag - print( - "There is a package that is available for one architecture, " - "but not the other.") - sys.exit(1) + print "There seems to be a problem with the specified package set." + if not options.force: + sys.exit(1) if options.clean: RemoveOldFiles(catalognames, target_host, target_dir) if options.dry_run: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue May 24 19:10:35 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 24 May 2011 17:10:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14639] csw/mgar/pkg Message-ID: <E1QOv7r-0004UY-Uc@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14639 http://gar.svn.sourceforge.net/gar/?rev=14639&view=rev Author: skayser Date: 2011-05-24 17:10:35 +0000 (Tue, 24 May 2011) Log Message: ----------- mscgen/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/mscgen/ csw/mgar/pkg/mscgen/branches/ csw/mgar/pkg/mscgen/tags/ csw/mgar/pkg/mscgen/trunk/ csw/mgar/pkg/mscgen/trunk/Makefile csw/mgar/pkg/mscgen/trunk/checksums csw/mgar/pkg/mscgen/trunk/files/ Property changes on: csw/mgar/pkg/mscgen/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar//v2 Added: csw/mgar/pkg/mscgen/trunk/Makefile =================================================================== --- csw/mgar/pkg/mscgen/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mscgen/trunk/Makefile 2011-05-24 17:10:35 UTC (rev 14639) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! doesn't build yet +# "adraw.h", line 82: warning: enumerator value overflows INT_MAX (2147483647) +# "adraw.c", line 138: warning: implicit function declaration: round +# "language.y", line 28: cannot find include file: <stdint.h> +# ... +# "language.y", line 199: warning: return value type mismatch +# "language.y", line 200: cannot recover from previous errors +# + +NAME = mscgen +VERSION = 0.20 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Message Sequence Chart (MSC) generator +define BLURB + Mscgen is a small program that parses Message Sequence Chart + descriptions and produces PNG, SVG, EPS or server side image maps + (ismaps) as the output. Message Sequence Charts (MSCs) are a way of + representing entities and interactions over some time period and are + often used in combination with SDL. MSCs are popular in Telecoms to + specify how protocols operate although MSCs need not be complicated to + create or use. Mscgen aims to provide a simple text language that is + clear to create, edit and understand, which can also be transformed into + common image formats for display or printing. +endef + +VENDOR_URL = http://www.mcternan.me.uk/mscgen/ +MASTER_SITES = http://www.mcternan.me.uk/mscgen/software/ +DISTFILES = $(NAME)-src-$(VERSION).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/mscgen/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mscgen/trunk/checksums =================================================================== --- csw/mgar/pkg/mscgen/trunk/checksums (rev 0) +++ csw/mgar/pkg/mscgen/trunk/checksums 2011-05-24 17:10:35 UTC (rev 14639) @@ -0,0 +1 @@ +65c90fb5150d7176b65b793f0faa7377 mscgen-src-0.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 24 23:30:50 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 May 2011 21:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14640] csw/mgar/pkg/apr-util/trunk Message-ID: <E1QOzBi-0003De-TK@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14640 http://gar.svn.sourceforge.net/gar/?rev=14640&view=rev Author: rthurner Date: 2011-05-24 21:30:50 +0000 (Tue, 24 May 2011) Log Message: ----------- apr-util: upgrade to 1.3.12 Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/apr-util/trunk/checksums Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2011-05-24 17:10:35 UTC (rev 14639) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2011-05-24 21:30:50 UTC (rev 14640) @@ -1,5 +1,5 @@ NAME = apr-util -VERSION = 1.3.10 +VERSION = 1.3.12 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Utilities Modified: csw/mgar/pkg/apr-util/trunk/checksums =================================================================== --- csw/mgar/pkg/apr-util/trunk/checksums 2011-05-24 17:10:35 UTC (rev 14639) +++ csw/mgar/pkg/apr-util/trunk/checksums 2011-05-24 21:30:50 UTC (rev 14640) @@ -1 +1 @@ -82acd25cf3df8c72eba44eaee8b80c19 apr-util-1.3.10.tar.gz +d1977289889592ef998e3f777f68efe4 apr-util-1.3.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 24 23:30:53 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 May 2011 21:30:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14641] csw/mgar/pkg/apr/trunk Message-ID: <E1QOzBl-0003Ds-DD@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14641 http://gar.svn.sourceforge.net/gar/?rev=14641&view=rev Author: rthurner Date: 2011-05-24 21:30:53 +0000 (Tue, 24 May 2011) Log Message: ----------- apr: upgrade to 1.4.5 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2011-05-24 21:30:50 UTC (rev 14640) +++ csw/mgar/pkg/apr/trunk/Makefile 2011-05-24 21:30:53 UTC (rev 14641) @@ -1,5 +1,5 @@ NAME = apr -VERSION = 1.4.2 +VERSION = 1.4.5 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2011-05-24 21:30:50 UTC (rev 14640) +++ csw/mgar/pkg/apr/trunk/checksums 2011-05-24 21:30:53 UTC (rev 14641) @@ -1,2 +1 @@ -700afb2b78a496891aa1243ad6830a15 0001-Force-newly-built-libs-in-testsuite.patch -fc80cb54f158c2674f9eeb47a1f672cd apr-1.4.2.tar.gz +97262fe54dddaf583eaaee3497a426e1 apr-1.4.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 24 23:39:42 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 May 2011 21:39:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14642] csw/mgar/pkg/apache2/trunk Message-ID: <E1QOzKI-00060L-Aq@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14642 http://gar.svn.sourceforge.net/gar/?rev=14642&view=rev Author: rthurner Date: 2011-05-24 21:39:42 +0000 (Tue, 24 May 2011) Log Message: ----------- apache2: upgrade to 2.2.19 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-05-24 21:30:53 UTC (rev 14641) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-05-24 21:39:42 UTC (rev 14642) @@ -1,7 +1,7 @@ # $Id$ NAME = httpd -VERSION = 2.2.17 +VERSION = 2.2.19 CATEGORIES = server DESCRIPTION = A high performance HTTP server. @@ -11,7 +11,7 @@ endef # Source location -MASTER_SITES = http://www.ibiblio.com/pub/mirrors/apache/httpd/ +MASTER_SITES = http://www.eu.apache.org/dist/httpd/ # work around dumb checkpkg not recognizing the license file ... LICENSE = LICENSE Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2011-05-24 21:30:53 UTC (rev 14641) +++ csw/mgar/pkg/apache2/trunk/checksums 2011-05-24 21:39:42 UTC (rev 14642) @@ -1 +1 @@ -66d8e107f85acc039fd5e624e85728a9 httpd-2.2.17.tar.gz +e9f5453e1e4d7aeb0e7ec7184c6784b5 httpd-2.2.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue May 24 23:50:49 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 24 May 2011 21:50:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14643] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: <E1QOzV3-0003Yv-GB@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14643 http://gar.svn.sourceforge.net/gar/?rev=14643&view=rev Author: rthurner Date: 2011-05-24 21:50:48 +0000 (Tue, 24 May 2011) Log Message: ----------- apr-util, remove unnecessary Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2011-05-24 21:39:42 UTC (rev 14642) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2011-05-24 21:50:48 UTC (rev 14643) @@ -19,9 +19,10 @@ LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat +RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWlibsqlite3-0 CSWunixodbc CSWexpat RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -56,7 +57,7 @@ CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_ldap.so CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libaprutil-1.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-pkgname-mismatch|file=opt/csw/lib/libaprutil-1.so.0.3.10|soname=libaprutil-1.so.0|pkgname=CSWapr-util|expected=['CSWlibaprutil-10',|'CSWlibaprutil-1-0'] +CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-pkgname-mismatch|file=opt/csw/lib/libaprutil-1.so.0.3.12|soname=libaprutil-1.so.0|pkgname=CSWapr-util|expected=['CSWlibaprutil-10',|'CSWlibaprutil-1-0'] CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_odbc.so CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 25 04:27:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 May 2011 02:27:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14644] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: <E1QP3os-0008Hy-NG@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14644 http://gar.svn.sourceforge.net/gar/?rev=14644&view=rev Author: bdwalton Date: 2011-05-25 02:27:34 +0000 (Wed, 25 May 2011) Log Message: ----------- cswutils/trunk: version bump for submitpkg change Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-24 21:50:48 UTC (rev 14643) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-25 02:27:34 UTC (rev 14644) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.18 +VERSION = 1.19 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 25 11:10:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 May 2011 09:10:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14645] csw/mgar/pkg/gnuplot/trunk/Makefile Message-ID: <E1QPA6z-0002xs-Tb@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14645 http://gar.svn.sourceforge.net/gar/?rev=14645&view=rev Author: dmichelsen Date: 2011-05-25 09:10:41 +0000 (Wed, 25 May 2011) Log Message: ----------- gnuplot: Enable X11 for base package as requested in #4773 and remove unneeded dependencies Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-25 02:27:34 UTC (rev 14644) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2011-05-25 09:10:41 UTC (rev 14645) @@ -31,10 +31,6 @@ RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibcairo -RUNTIME_DEP_PKGS_CSWgnuplot += CSWpango -RUNTIME_DEP_PKGS_CSWgnuplot += CSWglib2 PACKAGES += CSWgnuplot-wx CATALOGNAME_CSWgnuplot-wx = gnuplot_wx @@ -72,7 +68,7 @@ CONFIGURE_ARGS_wxwidgets-no += --without-cairo CONFIGURE_ARGS_wxwidgets-no += --disable-wxwidgets -CONFIGURE_ARGS_wxwidgets-no += --without-x +#CONFIGURE_ARGS_wxwidgets-no += --without-x CONFIGURE_ARGS += $(CONFIGURE_ARGS_wxwidgets-$(WXWIDGETS)) # Preset value until this is fixed: @@ -88,6 +84,7 @@ # These are exactly the differing files between the install-directories ALTERNATIVE_FILES += /opt/csw/bin/gnuplot +ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.4/gnuplot_x11 ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot-gui.elc ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot.elc ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.4/gnuplot.gih This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 25 15:19:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 May 2011 13:19:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14646] csw/mgar/pkg/cswcommon/trunk/Makefile Message-ID: <E1QPDzY-0005AF-Pn@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14646 http://gar.svn.sourceforge.net/gar/?rev=14646&view=rev Author: wahwah Date: 2011-05-25 13:19:16 +0000 (Wed, 25 May 2011) Log Message: ----------- pkg/cswcommon/trunk: This build description is not used Modified Paths: -------------- csw/mgar/pkg/cswcommon/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/cswcommon/trunk/Makefile Modified: csw/mgar/pkg/cswcommon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswcommon/trunk/Makefile 2011-05-25 09:10:41 UTC (rev 14645) +++ csw/mgar/pkg/cswcommon/trunk/Makefile 2011-05-25 13:19:16 UTC (rev 14646) @@ -1,3 +1,8 @@ +# $Id$ +# +# NOTE: This build description is not used. The released CSWcommon package is +# built from a different source. + NAME = cswcommon VERSION = 1.4.6 CATEGORIES = utils Property changes on: csw/mgar/pkg/cswcommon/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed May 25 18:00:54 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 25 May 2011 16:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14647] csw/mgar/pkg/nginx/trunk Message-ID: <E1QPGVy-0003uN-Co@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14647 http://gar.svn.sourceforge.net/gar/?rev=14647&view=rev Author: aigoshin Date: 2011-05-25 16:00:54 +0000 (Wed, 25 May 2011) Log Message: ----------- nginx: release 20110525 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-05-25 13:19:16 UTC (rev 14646) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-05-25 16:00:54 UTC (rev 14647) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.0.2 +VERSION = 1.0.3 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-05-25 13:19:16 UTC (rev 14646) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-05-25 16:00:54 UTC (rev 14647) @@ -1 +1 @@ -8a528ccaab3ddba84e72443fa40b19e7 nginx-1.0.2.tar.gz +eebf1e9c7e86f923923b828ae0156103 nginx-1.0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 25 20:03:41 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 25 May 2011 18:03:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14648] csw/mgar/pkg/alternatives/trunk/README Message-ID: <E1QPIQn-0002Fa-Ff@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14648 http://gar.svn.sourceforge.net/gar/?rev=14648&view=rev Author: theferret Date: 2011-05-25 18:03:41 +0000 (Wed, 25 May 2011) Log Message: ----------- alternatives: minor comments added to README Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/README Modified: csw/mgar/pkg/alternatives/trunk/README =================================================================== --- csw/mgar/pkg/alternatives/trunk/README 2011-05-25 16:00:54 UTC (rev 14647) +++ csw/mgar/pkg/alternatives/trunk/README 2011-05-25 18:03:41 UTC (rev 14648) @@ -5,3 +5,22 @@ did not play nicely with NFS-shared /opt/csw So pleaes dont go getting ideas that we can migrated back to redhat,etc in the future! :) we tried, and it failed. + + +Internal implementation notes: + + My initial version seems to expect each "alternative" to have its own +file in /opt/csw/share/alternatives/xyz. +One line per file only would be nice, please + +When a choice is manually set (overriding auto settings), it records that +fact by making a symlink from the shipped file, to +/etc/opt/csw/alternatives/(progname) + +This way, you can have the binary, and alternatives files per software, +NFS-shared, but then have machine-local overrides. + +Reminder: Do NOT have to get fancy with the class action script not + getting called with pathnames on sparse zones with pkg-inherit-dir, + because since /opt/csw is shared, the symlink will already be in place. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 25 20:27:58 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 25 May 2011 18:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14649] csw/mgar/pkg/alternatives/trunk/alternatives Message-ID: <E1QPIoI-0006NH-05@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14649 http://gar.svn.sourceforge.net/gar/?rev=14649&view=rev Author: theferret Date: 2011-05-25 18:27:57 +0000 (Wed, 25 May 2011) Log Message: ----------- alternatives: added --relink-missing Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2011-05-25 18:03:41 UTC (rev 14648) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2011-05-25 18:27:57 UTC (rev 14649) @@ -26,6 +26,10 @@ print " See comments in usage function code for more information." print " $prog --install {/full/path/name} {name} {#priority}" print " $prog --remove {name} {/full/path}" + print "" + print " The following are opencsw-only:" + print " $prog --relink-missing : create missing symlinks" + # I dont want to bloat up the usage message, so here's some more docs # @@ -98,10 +102,9 @@ nawk '$2 == "'$1'" {print}' | sort -nr +3 } -# User facing function. +# User facing function, as well as internal # enables "alternatives --list" function list_alternatives { - echo "List of installed software that uses the alternatives system:" cat $PRIORITIESDIR/* 2>/dev/null| nawk '{print $2}' | sort -u } @@ -136,7 +139,7 @@ exit 1 } -# Called only by set_alternative. +# Called only internally, by set_alternative. # args: {target} {shortname} {implementation-path} # Split out, because one "alternatives" line may have multiple "slave" links function set_link { @@ -384,6 +387,15 @@ set_manual_prio $1 $fullpath } +# User facing function: --relink-missing +# Used as a damage control function for zones that are non-sparse. +# Even though we dont officially support non-sparse zones :-) +# Go through and create links for all alternatives known. +function relink_missing { + for alt in `list_alternatives` ; do + set_alternative $alt + done +} ############################################################ # Return to "main" area below @@ -422,6 +434,7 @@ revert_to_auto $1 ;; --list) + echo "List of installed software that uses the alternatives system:" list_alternatives ;; --display) @@ -436,6 +449,9 @@ shift set_manual_prio $1 $2 ;; + --relink-missing) + relink_missing + ;; *) print -- $1 is not a recognized command. usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 25 21:16:02 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 25 May 2011 19:16:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14650] csw/mgar/pkg/alternatives/trunk/README.user Message-ID: <E1QPJYo-0005D2-Bz@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14650 http://gar.svn.sourceforge.net/gar/?rev=14650&view=rev Author: theferret Date: 2011-05-25 19:16:02 +0000 (Wed, 25 May 2011) Log Message: ----------- alternatives: add user facing doc file Added Paths: ----------- csw/mgar/pkg/alternatives/trunk/README.user Added: csw/mgar/pkg/alternatives/trunk/README.user =================================================================== --- csw/mgar/pkg/alternatives/trunk/README.user (rev 0) +++ csw/mgar/pkg/alternatives/trunk/README.user 2011-05-25 19:16:02 UTC (rev 14650) @@ -0,0 +1,44 @@ +This is a short documentation file for the OpenCSW targetted implementation of +linux style "alternatives", aka "update-alternatives" in debian. + +USER LEVEL DOCS + + alternatives --display shortname + # will display any currently installed symlink for "shortname" + # will display any installed packages that provide "shortname". + # will display current decision mode for --install, for "shortname" + # (either "auto", or [?? something else] + + + alternatives --config shortname + # will display any installed packages that provide "shortname". + # will prompt user for their preferred choice of package to use, + or to stick/revert to auto mode. + + alternatives --auto shortname + # sets shortname to be auto-chosen. Will adjust symlinks now, if appropriate + + alternatives --set shortname /provided/path + # sets shortname to be the implementation provided by /provided/path, + # IF PRESENT. + # Basically, sets that one to be artificially "highest priority", then + # configure the link now. + # If the manual setting is invalid, it will be ignored + + alternatives --install /full/path/name shortname /path/xx priority [...] + # notifies the alternatives handler, and says, + # "hey, here's an implementation. If its highest priority right now, + # use it!" + # Unlike redhat, we dont actually "register" anything. + + alternatives --remove shortname /full/path/name + # basically, a hint to reconfigure shortname "as appropriate", + # while ignoring anything matching /full/path/name as a valid alternative + + alternatives --list + # Gives a short list of programs "known" to alternatives, on this machine. + + alternatives --relink-missing + # if you are in a situation where symlinks have not been created, + # call this, and it will create any missing ones as appropriate + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Wed May 25 21:17:00 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Wed, 25 May 2011 19:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14651] csw/mgar/pkg/alternatives/trunk/alternatives Message-ID: <E1QPJZk-0005Fj-8I@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14651 http://gar.svn.sourceforge.net/gar/?rev=14651&view=rev Author: theferret Date: 2011-05-25 19:17:00 +0000 (Wed, 25 May 2011) Log Message: ----------- alternatives: bugfix for 4774 Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/alternatives Modified: csw/mgar/pkg/alternatives/trunk/alternatives =================================================================== --- csw/mgar/pkg/alternatives/trunk/alternatives 2011-05-25 19:16:02 UTC (rev 14650) +++ csw/mgar/pkg/alternatives/trunk/alternatives 2011-05-25 19:17:00 UTC (rev 14651) @@ -1,8 +1,9 @@ #!/bin/ksh -p # ksh high-level implentation of linux style "alternatives". -# Author: Philip Brown, phil at bolthole.com, 2010 -# @(#) alternatives 1.8@(#) +# Adjusted for OpenCSW needs +# Author: Philip Brown, phil at bolthole.com, 2010-2011 +# PRIORITIESDIR=/opt/csw/share/alternatives MANUALDIR=/etc/opt/csw/alternatives #manual override location @@ -19,7 +20,6 @@ print " $prog --auto {name}" print " $prog --set {name} {/full/path}" print " $prog --config {name}" - print " $prog --list" print " " print " The following are provided for compatibility, but do not work" print " in exactly the same way as linux variants" @@ -29,6 +29,9 @@ print "" print " The following are opencsw-only:" print " $prog --relink-missing : create missing symlinks" + print " $prog --list" + print "" + print "See /opt/csw/share/doc/alternatives/ for more docs" # I dont want to bloat up the usage message, so here's some more docs @@ -303,6 +306,12 @@ } # Usage: set_manual_prio shortname /full/path +# Sets a manual override for priorities, for "shortname", by finding +# the alternatives file supporting the desired combo, and making +# a symlink under $MANUALDIR, pointing to it. +# Attempting to set non-alternatives-supported paths is a user error +# Will then call our internal "make a symlink" routine to create the +# user-facing symlink for 'shortname'. function set_manual_prio { case $1 in */*) @@ -318,7 +327,7 @@ print Error: $MANUALDIR does not exist. Cannot continue exit 1 fi - check=`egrep -l "^[^ ]* $1 $2 " $PRIORITIESDIR/*` + check=`egrep -l "^[^ ]* [ ]*$1 [ ]*$2 " $PRIORITIESDIR/*` if [[ "$check" == "" ]] ; then print Error: no installed match found for $1 $2 exit 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 26 11:03:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 May 2011 09:03:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14652] csw/mgar/pkg/rbgems Message-ID: <E1QPWTx-0004s1-RV@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14652 http://gar.svn.sourceforge.net/gar/?rev=14652&view=rev Author: dmichelsen Date: 2011-05-26 09:03:53 +0000 (Thu, 26 May 2011) Log Message: ----------- rbgems/cronedit: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/cronedit/ csw/mgar/pkg/rbgems/cronedit/Makefile csw/mgar/pkg/rbgems/cronedit/branches/ csw/mgar/pkg/rbgems/cronedit/tags/ csw/mgar/pkg/rbgems/cronedit/trunk/ csw/mgar/pkg/rbgems/cronedit/trunk/Makefile csw/mgar/pkg/rbgems/cronedit/trunk/checksums csw/mgar/pkg/rbgems/cronedit/trunk/files/ csw/mgar/pkg/rbgems/cronedit/trunk/files/COPYING Copied: csw/mgar/pkg/rbgems/cronedit/Makefile (from rev 14635, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/cronedit/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/cronedit/Makefile 2011-05-26 09:03:53 UTC (rev 14652) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/cronedit/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/cronedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/cronedit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/cronedit/trunk/Makefile 2011-05-26 09:03:53 UTC (rev 14652) @@ -0,0 +1,16 @@ +NAME = cronedit +VERSION = 0.3.0 +CATEGORIES = rbgems + +DESCRIPTION = A Ruby editor library for the crontab + +define BLURB +endef + +DISTFILES += COPYING + +LICENSE = COPYING + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/cronedit/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/cronedit/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/cronedit/trunk/checksums 2011-05-26 09:03:53 UTC (rev 14652) @@ -0,0 +1 @@ +8768737b5e97b19ba15f31a047eed531 cronedit-0.3.0.gem Added: csw/mgar/pkg/rbgems/cronedit/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/rbgems/cronedit/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/rbgems/cronedit/trunk/files/COPYING 2011-05-26 09:03:53 UTC (rev 14652) @@ -0,0 +1,3 @@ +==Author +Viktor Zigo, http://alephzarro.com, All rights reserved. You can redistribute it and/or modify it under the same terms as Ruby. +(parts of the cronentry definition parsing code originally by gotoken at notwork.org) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri May 27 10:55:23 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 27 May 2011 08:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14653] csw/mgar/pkg/bind/trunk Message-ID: <E1QPspH-0001po-TE@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14653 http://gar.svn.sourceforge.net/gar/?rev=14653&view=rev Author: bonivart Date: 2011-05-27 08:55:23 +0000 (Fri, 27 May 2011) Log Message: ----------- bind/trunk: Update to 9.8.0-P2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2011-05-26 09:03:53 UTC (rev 14652) +++ csw/mgar/pkg/bind/trunk/Makefile 2011-05-27 08:55:23 UTC (rev 14653) @@ -6,7 +6,7 @@ CATEGORIES = net # Enable these for Px-releases -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2011-05-26 09:03:53 UTC (rev 14652) +++ csw/mgar/pkg/bind/trunk/checksums 2011-05-27 08:55:23 UTC (rev 14653) @@ -1 +1 @@ -d97ecd8f62a4cf4a769742c79cd8f921 bind-9.8.0-P1.tar.gz +5f90dcf1730631feacdad3257c465c54 bind-9.8.0-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Fri May 27 16:42:59 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Fri, 27 May 2011 14:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14654] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QPyFf-0000M3-W6@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14654 http://gar.svn.sourceforge.net/gar/?rev=14654&view=rev Author: ellson Date: 2011-05-27 14:42:59 +0000 (Fri, 27 May 2011) Log Message: ----------- graphviz: override PANGOCAIRO_CFLAGS due to autoconf problem, I think Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-27 08:55:23 UTC (rev 14653) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-27 14:42:59 UTC (rev 14654) @@ -220,6 +220,7 @@ CONFIGURE_ARGS += --disable-php CONFIGURE_ARGS += --disable-r CONFIGURE_ARGS += --enable-static --enable-shared +CONFIGURE_ARGS += "PANGOCAIRO_CFLAGS=`pkg-config --cflags pangocairo`" EXTRA_LD_FLAGS = -lm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sun May 29 02:40:42 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 29 May 2011 00:40:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14655] csw/mgar/pkg/dovecot/trunk Message-ID: <E1QQU3e-00049D-O9@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14655 http://gar.svn.sourceforge.net/gar/?rev=14655&view=rev Author: jake_goerzen Date: 2011-05-29 00:40:42 +0000 (Sun, 29 May 2011) Log Message: ----------- dovecot: maintenance update to version 1.2.17 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-05-27 14:42:59 UTC (rev 14654) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-05-29 00:40:42 UTC (rev 14655) @@ -5,7 +5,7 @@ # - USERGROUP doesn't work yet, wrong usage? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 1.2.16 +VERSION = 1.2.17 CATEGORIES = server DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2011-05-27 14:42:59 UTC (rev 14654) +++ csw/mgar/pkg/dovecot/trunk/checksums 2011-05-29 00:40:42 UTC (rev 14655) @@ -1 +1 @@ -8bbdf4e96e2e0f5749432ca9cb209a38 dovecot-1.2.16.tar.gz +a2c01cb0a9c54302d0870fdc3e6d2106 dovecot-1.2.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 29 09:24:41 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 29 May 2011 07:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14656] csw/mgar/pkg/cmake/trunk Message-ID: <E1QQaMb-00025R-Pr@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14656 http://gar.svn.sourceforge.net/gar/?rev=14656&view=rev Author: rthurner Date: 2011-05-29 07:24:41 +0000 (Sun, 29 May 2011) Log Message: ----------- cmake: upgrade to 2.8.4 Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2011-05-29 00:40:42 UTC (rev 14655) +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-05-29 07:24:41 UTC (rev 14656) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 2.8.2 +VERSION = 2.8.4 CATEGORIES = devel DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2011-05-29 00:40:42 UTC (rev 14655) +++ csw/mgar/pkg/cmake/trunk/checksums 2011-05-29 07:24:41 UTC (rev 14656) @@ -1 +1 @@ -8c967d5264657a798f22ee23976ff0d9 cmake-2.8.2.tar.gz +209b7d1d04b2e00986538d74ba764fcf cmake-2.8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 29 10:23:05 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 29 May 2011 08:23:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14657] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: <E1QQbH7-0003CQ-71@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14657 http://gar.svn.sourceforge.net/gar/?rev=14657&view=rev Author: rthurner Date: 2011-05-29 08:23:04 +0000 (Sun, 29 May 2011) Log Message: ----------- cmake-2.8.4: checkpkg exceptions ... Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2011-05-29 07:24:41 UTC (rev 14656) +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-05-29 08:23:04 UTC (rev 14657) @@ -26,7 +26,6 @@ RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat RUNTIME_DEP_PKGS_CSWcmake += CSWzlib -RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt # We define upstream file regex so we can be notifed of @@ -43,6 +42,73 @@ # switch off tests as two of them fail TEST_TARGET = +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakemodules.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmake.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-modules.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-modules.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-variables.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-variables.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.docbook +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPostgreSQL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindTCL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineSystem.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_mixer.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindTclStub.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMatlab.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPhysFS.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindUnixCommands.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindOpenAL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFLTK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindQt3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFreetype.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineJavaCompiler.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeGenericSystem.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGTK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindJNI.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindwxWidgets.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSquish.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMPEG.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindQt.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindKDE3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/GetPrerequisites.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindCUDA.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_net.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGTK2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFLTK2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindAVIFile.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLAPACK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLua50.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPHP4.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_image.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGIF.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindBLAS.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_sound.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_ttf.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPike.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPNG.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLua51.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindProducer.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMPEG2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSelfPackers.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/Platform/UnixPaths.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/Platform/BlueGeneP-base.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ctest +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindDart.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindQt3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindOpenGL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineJavaCompiler.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindQt.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakevars.1 + + include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules @@ -73,14 +139,10 @@ post-configure-modulated: @(echo "==> Forcing use of system libraries") @(echo "=====> curl, expat, xmlrpc, and zlib") - @(perl -i -plne 's/USE_SYSTEM_CURL:BOOL=OFF/USE_SYSTEM_CURL:BOOL=ON/' \ - $(WORKSRC)/CMakeCache.txt) - @(perl -i -plne 's/USE_SYSTEM_EXPAT:BOOL=OFF/USE_SYSTEM_EXPAT:BOOL=ON/' \ - $(WORKSRC)/CMakeCache.txt) - @(perl -i -plne 's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/' \ - $(WORKSRC)/CMakeCache.txt) - @(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/' \ - $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_CURL:BOOL=OFF/USE_SYSTEM_CURL:BOOL=ON/' $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_EXPAT:BOOL=OFF/USE_SYSTEM_EXPAT:BOOL=ON/' $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/' $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/' $(WORKSRC)/CMakeCache.txt) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun May 29 13:31:04 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 29 May 2011 12:31:04 +0100 Subject: [csw-devel] SF.net SVN: gar:[14657] csw/mgar/pkg/cmake/trunk/Makefile In-Reply-To: <E1QQbH7-0003CQ-71@sfp-svn-1.v30.ch3.sourceforge.com> References: <E1QQbH7-0003CQ-71@sfp-svn-1.v30.ch3.sourceforge.com> Message-ID: <BANLkTi=FaozP1bnvdmyciFT2U=DT7JUfoQ@mail.gmail.com> 2011/5/29 <rthurner at users.sourceforge.net>: > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake Hi Rupert, If there are "/usr/local" strings found in the binaries, it indicates that the binary might look for config or shared files in wrong places, e.g. /usr/local/share/foo instead of /opt/csw/share/foo. Maciej From ellson at users.sourceforge.net Sun May 29 16:44:20 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sun, 29 May 2011 14:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14658] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QQhE4-00083z-A9@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14658 http://gar.svn.sourceforge.net/gar/?rev=14658&view=rev Author: ellson Date: 2011-05-29 14:44:20 +0000 (Sun, 29 May 2011) Log Message: ----------- graphviz: gvpr_Makefile.am.patch - to work around libtool adding -ltdl to everything, gv_Makefile.am.patch - to work around broken compile switches from perl Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-29 08:23:04 UTC (rev 14657) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-29 14:44:20 UTC (rev 14658) @@ -14,10 +14,15 @@ # disable dependency checks because plugins depend on libs from base package ENABLE_CHECK = 0 +GARCOMPILER = GCC4 +#NORUNPATH = 1 + PATCHFILES += configure.patch PATCHFILES += Makefile.am.patch PATCHFILES += trapezoid.c.patch PATCHFILES += post_process.c.patch +PATCHFILES += gvpr_Makefile.am.patch +PATCHFILES += gv_Makefile.am.patch PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ @@ -220,6 +225,7 @@ CONFIGURE_ARGS += --disable-php CONFIGURE_ARGS += --disable-r CONFIGURE_ARGS += --enable-static --enable-shared +CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += "PANGOCAIRO_CFLAGS=`pkg-config --cflags pangocairo`" Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-29 08:23:04 UTC (rev 14657) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-29 14:44:20 UTC (rev 14658) @@ -7,4 +7,6 @@ 85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch +a9e6a8d6711f217155272c1e17e7d106 gvpr_Makefile.am.patch +a474494b403fe8217785c50eaee4a5df gv_Makefile.am.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz Added: csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2011-05-29 14:44:20 UTC (rev 14658) @@ -0,0 +1,15 @@ +--- graphviz-2.28.0/tclpkg/gv/Makefile.am.orig 2011-03-28 20:15:56.000000000 +0200 ++++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2011-05-29 16:38:29.887586723 +0200 +@@ -133,9 +133,9 @@ + + pkgperldir = $(pkglibdir)/perl + PERL ?= perl +-PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts) +-PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts) +-VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};') ++PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(SED) -e 's/-x[^ ]* //g'` ++PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts` ++VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'` + PERL_data = gv.pm + nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data) + libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c Added: csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch 2011-05-29 14:44:20 UTC (rev 14658) @@ -0,0 +1,11 @@ +--- graphviz-2.28.0/lib/gvpr/Makefile.am.orig 2011-05-29 14:42:32.102324093 +0200 ++++ graphviz-2.28.0/lib/gvpr/Makefile.am 2011-05-29 14:42:51.192032898 +0200 +@@ -3,6 +3,8 @@ + + pkgconfigdir = $(libdir)/pkgconfig + ++LIBS= ++ + GVPR_VERSION="2:0:0" + + AM_CPPFLAGS = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sun May 29 19:44:00 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sun, 29 May 2011 17:44:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14659] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QQk1w-0004vb-7P@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14659 http://gar.svn.sourceforge.net/gar/?rev=14659&view=rev Author: ellson Date: 2011-05-29 17:43:59 +0000 (Sun, 29 May 2011) Log Message: ----------- graphviz: more fixes for broken $(shell $(PERL) -MExtUtils::Embed -e ccopts) Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-29 14:44:20 UTC (rev 14658) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-29 17:43:59 UTC (rev 14659) @@ -15,7 +15,6 @@ ENABLE_CHECK = 0 GARCOMPILER = GCC4 -#NORUNPATH = 1 PATCHFILES += configure.patch PATCHFILES += Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-29 14:44:20 UTC (rev 14658) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-29 17:43:59 UTC (rev 14659) @@ -8,5 +8,5 @@ 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch a9e6a8d6711f217155272c1e17e7d106 gvpr_Makefile.am.patch -a474494b403fe8217785c50eaee4a5df gv_Makefile.am.patch +53b4189304d377812b47c885a4f97342 gv_Makefile.am.patch 8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz Modified: csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2011-05-29 14:44:20 UTC (rev 14658) +++ csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2011-05-29 17:43:59 UTC (rev 14659) @@ -7,7 +7,7 @@ -PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts) -PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts) -VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};') -+PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(SED) -e 's/-x[^ ]* //g'` ++PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(PERL) -pe 's/-x.*? //g'` +PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts` +VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'` PERL_data = gv.pm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:23:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:23:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14660] csw/mgar/pkg/exim/trunk Message-ID: <E1QQrCX-0004RP-7o@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14660 http://gar.svn.sourceforge.net/gar/?rev=14660&view=rev Author: bdwalton Date: 2011-05-30 01:23:24 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: initiate move to proper file locations by updated Local/Makefile patch Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch Removed Paths: ------------- csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-29 17:43:59 UTC (rev 14659) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:23:24 UTC (rev 14660) @@ -19,11 +19,11 @@ DISTFILES += CSWexim.postinstall CSWexim.postremove CSWexim.preremove DISTFILES += CSWexim.request CSWexim.cswreleasenotes -# NOTE TO FUTURE MAINTAINERS: -# This patch should be thoroughly reviewed for each update so as not to -# miss any new config options of interest... +# NOTE TO FUTURE MAINTAINERS: This patch should be thoroughly reviewed +# for each update so as not to miss any new config options of +# interest... Also, we start at 3 since we manually create a few git +# commits in pre-patch below. PATCHFILES += 0003-Set-OpenCSW-build-options.patch -PATCHFILES += 0004-Force-Compiler-and-a-few-compilation-options.patch BUILD_DEP_PKGS = CSWlibspf2-dev Modified: csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch =================================================================== --- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2011-05-29 17:43:59 UTC (rev 14659) +++ csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2011-05-30 01:23:24 UTC (rev 14660) @@ -1,6 +1,6 @@ -From 9e08d89739eab7fc54c07068d8f5f902c89ec3c8 Mon Sep 17 00:00:00 2001 +From 0ae00974e741f490e9c0613390374b1689b2d21d Mon Sep 17 00:00:00 2001 From: Ben Walton <bwalton at opencsw.org> -Date: Thu, 19 May 2011 01:47:39 +0200 +Date: Mon, 30 May 2011 03:15:26 +0200 Subject: [PATCH] Set OpenCSW build options Modify the template Local/Makefile to set the options for the csw @@ -8,14 +8,31 @@ Signed-off-by: Ben Walton <bwalton at opencsw.org> --- - Local/Makefile | 90 ++++++++++++++++++++++++++++---------------------------- - 1 files changed, 45 insertions(+), 45 deletions(-) + Local/Makefile | 101 +++++++++++++++++++++++++++++++------------------------- + 1 files changed, 56 insertions(+), 45 deletions(-) diff --git a/Local/Makefile b/Local/Makefile -index b0335a9..e0e9e36 100644 +index b0335a9..d2b2630 100644 --- a/Local/Makefile +++ b/Local/Makefile -@@ -100,7 +100,7 @@ +@@ -1,5 +1,16 @@ + # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ + ++# -I (CSW_WORKSRC).. is needed for the SPF2 hack (to pick up patched ++# SPF2 headers locally) ++ ++CC=$(CSW_CC) ++CFLAGS=-DHAVE_NS_TYPE -I$(CSW_WORKSRC) -I/opt/csw/include $(CSW_OPT) ++LDFLAGS=-L/opt/csw/mysql5/lib/mysql -L/opt/csw/postgresql/lib -L/opt/csw/lib -R/opt/csw/mysql5/lib/mysql -R/opt/csw/postgresql/lib ++ ++# This build system is a bit odd. They use LFLAGS where you'd normally ++# expect to see LDFLAGS. I don't see where it gets set though...? Typo? ++LFLAGS += $(LDFLAGS) ++ + ################################################## + # The Exim mail transport agent # + ################################################## +@@ -100,7 +111,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -24,16 +41,16 @@ #------------------------------------------------------------------------------ -@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin +@@ -116,7 +127,7 @@ BIN_DIRECTORY=/usr/exim/bin # don't exist. It will also install a default runtime configuration if this # file does not exist. -CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=/opt/csw/etc/exim/exim.conf ++CONFIGURE_FILE=/etc/opt/csw/exim/exim.conf # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. -@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure +@@ -133,7 +144,7 @@ CONFIGURE_FILE=/usr/exim/configure # deliveries. (Local deliveries run as various non-root users, typically as the # owner of a local mailbox.) Specifying these values as root is not supported. @@ -42,16 +59,16 @@ # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this -@@ -175,7 +175,7 @@ EXIM_USER= +@@ -175,7 +186,7 @@ EXIM_USER= # Almost all installations choose this: -SPOOL_DIRECTORY=/var/spool/exim -+SPOOL_DIRECTORY=/opt/csw/var/spool/exim ++SPOOL_DIRECTORY=/var/opt/csw/spool/exim -@@ -213,7 +213,7 @@ ROUTER_REDIRECT=yes +@@ -213,7 +224,7 @@ ROUTER_REDIRECT=yes # This one is very special-purpose, so is not included by default. @@ -60,7 +77,7 @@ #------------------------------------------------------------------------------ -@@ -234,7 +234,7 @@ TRANSPORT_SMTP=yes +@@ -234,7 +245,7 @@ TRANSPORT_SMTP=yes # This one is special-purpose, and commonly not required, so it is not # included by default. @@ -69,7 +86,7 @@ #------------------------------------------------------------------------------ -@@ -243,9 +243,9 @@ TRANSPORT_SMTP=yes +@@ -243,9 +254,9 @@ TRANSPORT_SMTP=yes # MBX, is included only when requested. If you do not know what this is about, # leave these settings commented out. @@ -82,7 +99,7 @@ #------------------------------------------------------------------------------ -@@ -286,16 +286,16 @@ LOOKUP_DBM=yes +@@ -286,16 +297,16 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -107,7 +124,7 @@ # LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes -@@ -316,7 +316,7 @@ LOOKUP_DNSDB=yes +@@ -316,7 +327,7 @@ LOOKUP_DNSDB=yes # with Solaris 7 onwards. Uncomment whichever of these you are using. # LDAP_LIB_TYPE=OPENLDAP1 @@ -116,7 +133,7 @@ # LDAP_LIB_TYPE=NETSCAPE # LDAP_LIB_TYPE=SOLARIS -@@ -345,8 +345,8 @@ PCRE_LIBS=-lpcre +@@ -345,8 +356,8 @@ PCRE_LIBS=-lpcre # specified in INCLUDE. The settings below are just examples; -lpq is for # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. @@ -127,7 +144,7 @@ #------------------------------------------------------------------------------ -@@ -367,14 +367,14 @@ EXIM_MONITOR=eximon.bin +@@ -367,14 +378,14 @@ EXIM_MONITOR=eximon.bin # and the MIME ACL. Please read the documentation to learn more about these # features. @@ -144,7 +161,7 @@ # If you're using ClamAV and are backporting fixes to an old version, instead # of staying current (which is the more usual approach) then you may need to -@@ -404,9 +404,9 @@ EXIM_MONITOR=eximon.bin +@@ -404,9 +415,9 @@ EXIM_MONITOR=eximon.bin # installed on your system (www.libspf2.org). Depending on where it is installed # you may have to edit the CFLAGS and LDFLAGS lines. @@ -156,16 +173,16 @@ # Uncomment the following lines to add SRS (Sender rewriting scheme) support. # You need to have libsrs_alt installed on your system (srs.mirtol.com). -@@ -493,7 +493,7 @@ FIXED_NEVER_USERS=root +@@ -493,7 +504,7 @@ FIXED_NEVER_USERS=root # configurations to be used. The prefix can be more restrictive than just a # directory (the second example). -# ALT_CONFIG_PREFIX=/some/directory/ -+ALT_CONFIG_PREFIX=/opt/csw/etc/exim/ ++ALT_CONFIG_PREFIX=/etc/opt/csw/exim/ # ALT_CONFIG_PREFIX=/some/directory/exim.conf- -@@ -552,11 +552,11 @@ FIXED_NEVER_USERS=root +@@ -552,11 +563,11 @@ FIXED_NEVER_USERS=root # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -182,7 +199,7 @@ #------------------------------------------------------------------------------ -@@ -564,7 +564,7 @@ FIXED_NEVER_USERS=root +@@ -564,7 +575,7 @@ FIXED_NEVER_USERS=root # Cyrus SASL library installed before trying to build Exim, and you probably # want to uncomment the following line: @@ -191,7 +208,7 @@ #------------------------------------------------------------------------------ -@@ -593,7 +593,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -593,7 +604,7 @@ HEADERS_CHARSET="ISO-8859-1" # the Sieve filter support. For those OS where iconv() is known to be installed # as standard, the file in OS/Makefile-xxxx contains # @@ -200,7 +217,7 @@ # # If you are not using one of those systems, but have installed iconv(), you # need to uncomment that line above. In some cases, you may find that iconv() -@@ -602,7 +602,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -602,7 +613,7 @@ HEADERS_CHARSET="ISO-8859-1" # # HAVE_ICONV=yes # CFLAGS=-O -I/usr/local/include @@ -209,7 +226,7 @@ # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -655,10 +655,10 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -655,10 +666,10 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -222,7 +239,7 @@ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -677,7 +677,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -677,7 +688,7 @@ HEADERS_CHARSET="ISO-8859-1" # with all your other libraries. If they are in a special directory, you may # need something like @@ -231,7 +248,7 @@ # or # TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -@@ -685,7 +685,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -685,7 +696,7 @@ HEADERS_CHARSET="ISO-8859-1" # auxiliary programs. If the include files are not in a standard place, you can # set TLS_INCLUDE to specify where they are, for example: @@ -240,7 +257,7 @@ # or # TLS_INCLUDE=-I/opt/gnu/include -@@ -709,7 +709,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -709,7 +720,7 @@ HEADERS_CHARSET="ISO-8859-1" # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. @@ -249,16 +266,16 @@ #------------------------------------------------------------------------------ -@@ -722,7 +722,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -722,7 +733,7 @@ HEADERS_CHARSET="ISO-8859-1" # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: -# LOG_FILE_PATH=/var/log/exim_%slog -+LOG_FILE_PATH=/opt/csw/var/log/exim/%slog ++LOG_FILE_PATH=/var/opt/csw/log/exim/%slog # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -771,7 +771,7 @@ EXICYCLOG_MAX=10 +@@ -771,7 +782,7 @@ EXICYCLOG_MAX=10 # files. Both the name of the command and the suffix that it adds to files # need to be defined here. See also the EXICYCLOG_MAX configuration. @@ -267,7 +284,7 @@ COMPRESS_SUFFIX=gz -@@ -779,7 +779,7 @@ COMPRESS_SUFFIX=gz +@@ -779,7 +790,7 @@ COMPRESS_SUFFIX=gz # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. @@ -276,7 +293,7 @@ #------------------------------------------------------------------------------ -@@ -798,7 +798,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -798,7 +809,7 @@ ZCAT_COMMAND=/usr/bin/zcat # that the local_scan API is made available by the linker. You may also need # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. @@ -285,7 +302,7 @@ #------------------------------------------------------------------------------ -@@ -808,7 +808,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -808,7 +819,7 @@ ZCAT_COMMAND=/usr/bin/zcat # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -294,7 +311,7 @@ # You probably need to add -lpam to EXTRALIBS, and in some releases of # GNU/Linux -ldl is also needed. -@@ -912,7 +912,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -912,7 +923,7 @@ ZCAT_COMMAND=/usr/bin/zcat # (the value doesn't matter), the symbolic link is not created or moved. You # will then have to "turn Exim on" by setting up the link manually. @@ -303,12 +320,12 @@ #------------------------------------------------------------------------------ -@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -924,7 +935,7 @@ ZCAT_COMMAND=/usr/bin/zcat # aliases). The following setting can be changed to specify a different # location for the system alias file. -SYSTEM_ALIASES_FILE=/etc/aliases -+SYSTEM_ALIASES_FILE=/opt/csw/etc/exim/aliases ++SYSTEM_ALIASES_FILE=/etc/opt/csw/exim/aliases #------------------------------------------------------------------------------ Deleted: csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch =================================================================== --- csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch 2011-05-29 17:43:59 UTC (rev 14659) +++ csw/mgar/pkg/exim/trunk/files/0004-Force-Compiler-and-a-few-compilation-options.patch 2011-05-30 01:23:24 UTC (rev 14660) @@ -1,37 +0,0 @@ -From fe5dfda4e0b20be76a30dfe20a4bee8265bd00f6 Mon Sep 17 00:00:00 2001 -From: Ben Walton <bwalton at opencsw.org> -Date: Thu, 19 May 2011 01:51:46 +0200 -Subject: [PATCH] Force Compiler and a few compilation options - -We need to force the use of compiler and add a few extra CFLAGS and -LDFLAGS. - -Signed-off-by: Ben Walton <bwalton at opencsw.org> ---- - Local/Makefile | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/Local/Makefile b/Local/Makefile -index e0e9e36..68bd009 100644 ---- a/Local/Makefile -+++ b/Local/Makefile -@@ -1,5 +1,16 @@ - # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ - -+# -I (CSW_WORKSRC).. is needed for the SPF2 hack (to pick up patched -+# SPF2 headers locally) -+ -+CC=$(CSW_CC) -+CFLAGS=-DHAVE_NS_TYPE -I$(CSW_WORKSRC) -I/opt/csw/include $(CSW_OPT) -+LDFLAGS=-L/opt/csw/mysql5/lib/mysql -L/opt/csw/postgresql/lib -L/opt/csw/lib -R/opt/csw/mysql5/lib/mysql -R/opt/csw/postgresql/lib -+ -+# This build system is a bit odd. They use LFLAGS where you'd normally -+# expect to see LDFLAGS. I don't see where it gets set though...? Typo? -+LFLAGS += $(LDFLAGS) -+ - ################################################## - # The Exim mail transport agent # - ################################################## --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:32:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:32:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14661] csw/mgar/pkg/exim/trunk/Makefile Message-ID: <E1QQrLN-00049k-Jm@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14661 http://gar.svn.sourceforge.net/gar/?rev=14661&view=rev Author: bdwalton Date: 2011-05-30 01:32:33 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: update paths in recipe to reflect filesystem normalization Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:23:24 UTC (rev 14660) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:32:33 UTC (rev 14661) @@ -87,7 +87,7 @@ PROTOTYPE_USER_eximowned = exim PROTOTYPE_GROUP_eximowned = exim PROTOTYPE_PERMS_eximowned = 750 -PROTOTYPE_FILES_eximowned = $(prefix)/var/log/exim $(prefix)/var/spool/exim +PROTOTYPE_FILES_eximowned = /var$(prefix)/log/exim /var$(prefix)/spool/exim include gar/category.mk @@ -113,7 +113,7 @@ mv exim-$(VERSION)-1 exim; \ /usr/ccs/bin/strip $(BINS); \ /usr/ccs/bin/mcs -d $(BINS)) - (cd $(DESTDIR)$(prefix)/etc/exim; \ + (cd $(DESTDIR)/etc/$(prefix)/exim; \ for i in aliases exim.conf; do \ if [ -r "$$i" ]; then \ echo "$$i -> $$i.CSW"; \ @@ -123,9 +123,9 @@ (cd $(DESTDIR); mkdir -p etc/opt/csw/init.d; \ cp $(abspath $(FILEDIR)/cswexim) etc/opt/csw/init.d ) mkdir -p $(DESTDIR)$(prefix)/share/doc/exim - mkdir -p $(DESTDIR)$(prefix)/var/spool/exim + mkdir -p $(DESTDIR)/var/$(prefix)/spool/exim cp -p files/README.CSW $(DESTDIR)$(prefix)/share/doc/exim/README.CSW - cp -p files/exim-env.sh $(DESTDIR)$(prefix)/etc/exim/exim-env.sh.CSW + cp -p files/exim-env.sh $(DESTDIR)/etc/$(prefix)/exim/exim-env.sh.CSW (cd $(WORKSRC)/doc; \ cp -p $(DOC_LIST) $(DESTDIR)$(prefix)/share/doc/exim) gzip -f $(DESTDIR)$(prefix)/share/doc/exim/ChangeLog @@ -135,5 +135,5 @@ post-merge: ( cd $(PKGROOT); mkdir -p ./$(UGPATH); \ echo "$(UGENTRY)" > ./$(UGPATH)/cswusergroup ) - ( cd $(PKGROOT); mkdir -p opt/csw/var/log/exim ) + ( cd $(PKGROOT); mkdir -p var/opt/csw/log/exim ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:42:25 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:42:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14662] csw/mgar/pkg/exim/trunk/files Message-ID: <E1QQrUv-0004rv-9B@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14662 http://gar.svn.sourceforge.net/gar/?rev=14662&view=rev Author: bdwalton Date: 2011-05-30 01:42:25 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: drop a few of the legacy files for handling initsmf stuff Removed Paths: ------------- csw/mgar/pkg/exim/trunk/files/CSWexim.checkinstall csw/mgar/pkg/exim/trunk/files/i.smfno csw/mgar/pkg/exim/trunk/files/i.smfyes Deleted: csw/mgar/pkg/exim/trunk/files/CSWexim.checkinstall =================================================================== --- csw/mgar/pkg/exim/trunk/files/CSWexim.checkinstall 2011-05-30 01:32:33 UTC (rev 14661) +++ csw/mgar/pkg/exim/trunk/files/CSWexim.checkinstall 2011-05-30 01:42:25 UTC (rev 14662) @@ -1,21 +0,0 @@ -#!/sbin/sh -trap `exit 3` 15 -# Assign Solaris release class to install release specific files -smf=no -test -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm && smf=yes - -if [ $smf = yes ] -then - CLASSES='none smfyes' -else - CLASSES='none smfno' -fi - -# Make env variables available to other packaging scripts - -cat >>$1 <<! -CLASSES='$CLASSES' -SM_ACTION='$SM_ACTION' -! - -exit 0 Deleted: csw/mgar/pkg/exim/trunk/files/i.smfno =================================================================== --- csw/mgar/pkg/exim/trunk/files/i.smfno 2011-05-30 01:32:33 UTC (rev 14661) +++ csw/mgar/pkg/exim/trunk/files/i.smfno 2011-05-30 01:42:25 UTC (rev 14662) @@ -1,7 +0,0 @@ -#!/sbin/sh -echo "Installing class <smfno>." -while read src dest; do - /bin/cp -p "$src" "$dest" || exit 2 - echo "$dest" -done -exit 0 Deleted: csw/mgar/pkg/exim/trunk/files/i.smfyes =================================================================== --- csw/mgar/pkg/exim/trunk/files/i.smfyes 2011-05-30 01:32:33 UTC (rev 14661) +++ csw/mgar/pkg/exim/trunk/files/i.smfyes 2011-05-30 01:42:25 UTC (rev 14662) @@ -1,7 +0,0 @@ -#!/sbin/sh -echo "Installing class <smfyes>." -while read src dest; do - /bin/cp -p "$src" "$dest" || exit 2 - echo "$dest" -done -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:44:44 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14663] csw/mgar/pkg/exim/trunk Message-ID: <E1QQrXA-0004M5-0H@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14663 http://gar.svn.sourceforge.net/gar/?rev=14663&view=rev Author: bdwalton Date: 2011-05-30 01:44:43 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: update config file handling to use preserveconf Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:42:25 UTC (rev 14662) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:44:43 UTC (rev 14663) @@ -42,6 +42,9 @@ INITSMF = /etc/opt/csw/init.d/cswexim +PRESERVECONF += /etc/opt/csw/exim/exim.conf /etc/opt/csw/exim/exim-env.sh +PRESERVECONF += /etc/opt/csw/exim/aliases + # scripts/exim_install has been patched to use this variable EXIM_VERSION = $(VERSION) export EXIM_VERSION @@ -113,19 +116,12 @@ mv exim-$(VERSION)-1 exim; \ /usr/ccs/bin/strip $(BINS); \ /usr/ccs/bin/mcs -d $(BINS)) - (cd $(DESTDIR)/etc/$(prefix)/exim; \ - for i in aliases exim.conf; do \ - if [ -r "$$i" ]; then \ - echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ - fi \ - done) (cd $(DESTDIR); mkdir -p etc/opt/csw/init.d; \ cp $(abspath $(FILEDIR)/cswexim) etc/opt/csw/init.d ) mkdir -p $(DESTDIR)$(prefix)/share/doc/exim mkdir -p $(DESTDIR)/var/$(prefix)/spool/exim cp -p files/README.CSW $(DESTDIR)$(prefix)/share/doc/exim/README.CSW - cp -p files/exim-env.sh $(DESTDIR)/etc/$(prefix)/exim/exim-env.sh.CSW + cp -p files/exim-env.sh $(DESTDIR)/etc/$(prefix)/exim/ (cd $(WORKSRC)/doc; \ cp -p $(DOC_LIST) $(DESTDIR)$(prefix)/share/doc/exim) gzip -f $(DESTDIR)$(prefix)/share/doc/exim/ChangeLog Modified: csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall =================================================================== --- csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall 2011-05-30 01:42:25 UTC (rev 14662) +++ csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall 2011-05-30 01:44:43 UTC (rev 14663) @@ -1,6 +1,6 @@ #!/sbin/sh CONFDIR=$PKG_INSTALL_ROOT/opt/csw/etc/exim -CONFFILES="aliases exim.conf exim-env.sh" + PATH=/bin:/usr/bin:"$PATH" export PATH @@ -9,21 +9,6 @@ mount | grep '^/usr ' | grep 'read only' >/dev/null } -### Set up config-file related stuff - -echo "" -echo "Setting up config-files..." -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - if [ -r "$confpath" ]; then - echo "Not touching existing $confpath" - else - echo "Copying $confpath.CSW to $confpath" - cp -p "$confpath.CSW" "$confpath" - fi -done -echo "" - is_usr_readonly if [ $? -eq 0 -a "$SENDMAIL_ACTION" != "leave" ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:49:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:49:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14664] csw/mgar/pkg/exim/trunk Message-ID: <E1QQrbN-00052B-IG@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14664 http://gar.svn.sourceforge.net/gar/?rev=14664&view=rev Author: bdwalton Date: 2011-05-30 01:49:05 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: drop preremove script since preserveconf handles this now Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/exim/trunk/files/CSWexim.preremove Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:44:43 UTC (rev 14663) +++ csw/mgar/pkg/exim/trunk/Makefile 2011-05-30 01:49:05 UTC (rev 14664) @@ -16,7 +16,7 @@ MASTER_SITES = ftp://ftp.exim.org/pub/exim/exim4/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += CSWexim.postinstall CSWexim.postremove CSWexim.preremove +DISTFILES += CSWexim.postinstall CSWexim.postremove DISTFILES += CSWexim.request CSWexim.cswreleasenotes # NOTE TO FUTURE MAINTAINERS: This patch should be thoroughly reviewed Deleted: csw/mgar/pkg/exim/trunk/files/CSWexim.preremove =================================================================== --- csw/mgar/pkg/exim/trunk/files/CSWexim.preremove 2011-05-30 01:44:43 UTC (rev 14663) +++ csw/mgar/pkg/exim/trunk/files/CSWexim.preremove 2011-05-30 01:49:05 UTC (rev 14664) @@ -1,17 +0,0 @@ -#!/sbin/sh - -CONFDIR=$PKG_INSTALL_ROOT/opt/csw/etc/exim -CONFFILES="aliases exim.conf exim-env.sh" -PATH=/bin:/usr/bin:"$PATH" -export PATH - -for file in $CONFFILES; do - confpath="$CONFDIR/$file" - diff "$confpath" "$confpath.CSW" >/dev/null 2>&1 - if [ $? != 0 ]; then - echo "Not touching modified $confpath" - else - echo "Removing unmodified $confpath" - rm -f "$confpath" - fi -done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 30 03:51:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 May 2011 01:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14665] csw/mgar/pkg/exim/trunk/files/cswexim Message-ID: <E1QQrdF-0004SJ-4K@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14665 http://gar.svn.sourceforge.net/gar/?rev=14665&view=rev Author: bdwalton Date: 2011-05-30 01:51:00 +0000 (Mon, 30 May 2011) Log Message: ----------- exim/trunk: update init script for new (normalized) paths Modified Paths: -------------- csw/mgar/pkg/exim/trunk/files/cswexim Modified: csw/mgar/pkg/exim/trunk/files/cswexim =================================================================== --- csw/mgar/pkg/exim/trunk/files/cswexim 2011-05-30 01:49:05 UTC (rev 14664) +++ csw/mgar/pkg/exim/trunk/files/cswexim 2011-05-30 01:51:00 UTC (rev 14665) @@ -14,8 +14,8 @@ DAEMON=/opt/csw/sbin/exim PIDFILE=/var/run/exim.pid -CONFFILE=/opt/csw/etc/exim/exim.conf -ENVFILE=/opt/csw/etc/exim/exim-env.sh +CONFFILE=/etc/opt/csw/exim/exim.conf +ENVFILE=/etc/opt/csw/exim/exim-env.sh # Exit if there's no exim binary test -x "$DAEMON" || exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon May 30 13:23:51 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 30 May 2011 11:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14666] csw/mgar/pkg Message-ID: <E1QR0Zb-0000T5-1D@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14666 http://gar.svn.sourceforge.net/gar/?rev=14666&view=rev Author: skayser Date: 2011-05-30 11:23:50 +0000 (Mon, 30 May 2011) Log Message: ----------- ipv6calc/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/ipv6calc/ csw/mgar/pkg/ipv6calc/branches/ csw/mgar/pkg/ipv6calc/tags/ csw/mgar/pkg/ipv6calc/trunk/ csw/mgar/pkg/ipv6calc/trunk/Makefile csw/mgar/pkg/ipv6calc/trunk/checksums csw/mgar/pkg/ipv6calc/trunk/files/ Property changes on: csw/mgar/pkg/ipv6calc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar//v2 Added: csw/mgar/pkg/ipv6calc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ipv6calc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ipv6calc/trunk/Makefile 2011-05-30 11:23:50 UTC (rev 14666) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! ./configure fails, check for GeoIP doesn't include -lsocket +# +NAME = ipv6calc +VERSION = 0.90.0 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Utility for manipulating and querying IPv6 addresses +define BLURB + ipv6calc is a small utility written in programming language C to + manipulate (not only) IPv6 addresses. Intentions were convering a given + IPv6 address into compressed format, convering a given IPv6 address into + the same format like shown in /proc/net/if_inet6 and (because it was not + difficulty) migrating the Perl program ip6_int into. Now only one + utiltity is needed to do a lot. +endef + +VENDOR_URL = http://www.deepspace6.net/projects/ipv6calc.html +MASTER_SITES = ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-geoip +CONFIGURE_ARGS += --with-geoip-headers=$(includedir) +CONFIGURE_ARGS += --with-geoip-lib=$(libdir) + +include gar/category.mk Property changes on: csw/mgar/pkg/ipv6calc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ipv6calc/trunk/checksums =================================================================== --- csw/mgar/pkg/ipv6calc/trunk/checksums (rev 0) +++ csw/mgar/pkg/ipv6calc/trunk/checksums 2011-05-30 11:23:50 UTC (rev 14666) @@ -0,0 +1 @@ +c1a654214058fdac5f8c2ba6a196e2b8 ipv6calc-0.90.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Mon May 30 16:54:35 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Mon, 30 May 2011 14:54:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14667 http://gar.svn.sourceforge.net/gar/?rev=14667&view=rev Author: ellson Date: 2011-05-30 14:54:34 +0000 (Mon, 30 May 2011) Log Message: ----------- graphviz: why aren't transitive dependencies handled automatically? Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 11:23:50 UTC (rev 14666) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 14:54:34 UTC (rev 14667) @@ -62,24 +62,28 @@ BUILD_DEP_PKGS = RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ - CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ - CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg + CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ + CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg \ + CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizdoc = RUNTIME_DEP_PKGS_CSWgraphvizgraphs = -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWgraphviz CSWzlib -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile -RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava -RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua -RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml -RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl -RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 -RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWgraphviz CSWzlib -RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr -RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ + CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ + CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWlibcairo CSWfconfig CSWpango CSWftype2 CSWgts CSWlibintl8 \ + CSWglib2 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphviz2 = CSWgraphviz LICENSE_CSWgraphviz = COPYING @@ -243,3 +247,82 @@ post-merge: gln -s . $(PKGROOT)$(prefix)/graphviz2 @$(MAKECOOKIE) + +CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphviz2 += surplus-dependency|CSWgraphviz +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWglib2 +CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWgd +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWexpat +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWxpm +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWzlib +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWftype2 +CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWiconv +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWgts +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpango +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpng +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWfconfig +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibcairo +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibcairo +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWtcl +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWfconfig +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3corert|or|CSWgcc4corert +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWpango +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWftype2 +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgts +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/tcldot.3tcl +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtclplan.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot_builtin.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtkspline.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWexpat +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3g++rt|or|CSWgcc4g++rt +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWglib2 +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWzlib +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += non-uniform-lib-versions-in-package|sonames=libcdt.so.5,libcgraph.so.6,libgraph.so.5,libgvc.so.6,libgvpr.so.2,libpathplan.so.4,libxdot.so.4 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/FAQ.html +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/FAQ.html +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/ChangeLog +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/winbuild.html +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/build.html +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/info/command.html +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon May 30 17:52:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 30 May 2011 16:52:56 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> Message-ID: <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> Hi John, Here's a review of the change you submitted to the code repository. There are some overrides that I suspect might be actual problems with the packages. There could be overrides that you put in because you have verified that checkpkg returned false positives. If this is the case, could you point these out? This way, we could improve checkpkg and reduce the rate of false positives. More comments below. 2011/5/30 <ellson at users.sourceforge.net>: > Revision: 14667 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=14667&view=rev > Author: ? ellson > Date: ? ? 2011-05-30 14:54:34 +0000 (Mon, 30 May 2011) > > Log Message: > ----------- > graphviz: why aren't transitive dependencies handled automatically? > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/graphviz/trunk/Makefile > > Modified: csw/mgar/pkg/graphviz/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-30 11:23:50 UTC (rev 14666) > +++ csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-30 14:54:34 UTC (rev 14667) > @@ -62,24 +62,28 @@ > ?BUILD_DEP_PKGS = > > ?RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ > - ? ? ? CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ > - ? ? ? CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg > + ? ? ? CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ > + ? ? ? CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg \ > + ? ? ? CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 > ?RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz > ?RUNTIME_DEP_PKGS_CSWgraphvizdoc = > ?RUNTIME_DEP_PKGS_CSWgraphvizgraphs = > -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWgraphviz > -RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil > -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWgraphviz CSWzlib > -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile > -RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava > -RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua > -RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml > -RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl > -RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 > -RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWgraphviz CSWzlib > -RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr > -RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby > -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz > +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ > + ? ? ? CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ > + ? ? ? CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz At OpenCSW, we use += to append to variables: RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd (...) RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpango CSWlibintl8 (...) > +CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl This is probably OK to override, especially since it's a demo. But if you notice /usr/local inside binaries, it's worth investigating (hardcoded paths ? potential bugs). > +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so Are you sure this is safe to override? Are these loaded via dlopen so RPATH doesn't matter? > +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so > +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so > +CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono If you have an idea how checkpkg can detect a dependency on CSWmono, we could make this one go away. > +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so > +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so > +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so > +CHECKPKG_OVERRIDES_CSWgraphviz2 += surplus-dependency|CSWgraphviz > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWglib2 Why this override, are you sure that overriding this is the right thing to do? > +CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWgd Is this dependency actually needed? > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWexpat > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWxpm > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWzlib > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWftype2 checkpkg likely gave explenations why these dependencies are required. Can you look at these? It might turn out that not having them is a bug. > +CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibltdl7 > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWiconv > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWgts > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpango > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibintl8 > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpng > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWfconfig > +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibcairo > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibcairo Are you sure these dependencies are not needed? > +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWtcl > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWfconfig > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3corert|or|CSWgcc4corert > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWpango > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWftype2 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgts > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/tcldot.3tcl > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtclplan.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot_builtin.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtkspline.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libgv_tcl.so > +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so > +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so > +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibltdl7 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWexpat > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3g++rt|or|CSWgcc4g++rt > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibintl8 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWglib2 > +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWzlib > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static > +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += non-uniform-lib-versions-in-package|sonames=libcdt.so.5,libcgraph.so.6,libgraph.so.5,libgvc.so.6,libgvpr.so.2,libpathplan.so.4,libxdot.so.4 Since libgvc.so.6 supersedes libgvc.so.5, you need to take care to include the libgvc.so.5 file as well. I would suggest splitting the shared libraries, to help with shared libraries in the future. libgvc.so.5 could be packaged as CSWlibgvc5 and libgvc.so.6 as CSWlibgvc6. >From looking at the package database, libgvc.so.5 is required for imagemagick to work, so you need to take care not to break it. I would suggest creating the following dependency chain: CSWimagemagick ? CSWgraphviz ? CSWlibgvc5 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 > +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so > +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so > +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so > +CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/FAQ.html > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/FAQ.html > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/ChangeLog > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/winbuild.html > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/build.html > +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/info/command.html Since it's a doc package, you can substitue all the specific overrides with one general override: CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content It will apply to all the instances of the file-with-bad-content error for the CSWgraphvizdoc package. > +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so > +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so > +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so These are essentially repetitions of the previous errors. Generally, I would suggest scrolling up (checkpkg output is probably quite long) and reading explanations that checkpkg gives. For instance, if you see soname-not-found, checkpkg will explain why is it not found, what is the RPATH, and where are the files that could be found. For other errors, checkpkg tries to give additional details to help figure out what is the exact problem that checkpkg reports. If you have any questions, please ask! Thanks, Maciej From skayser at users.sourceforge.net Mon May 30 21:11:07 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 30 May 2011 19:11:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14668] csw/mgar/pkg/mgar/trunk/files/changelog.CSW Message-ID: <E1QR7rn-0004rN-EI@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14668 http://gar.svn.sourceforge.net/gar/?rev=14668&view=rev Author: skayser Date: 2011-05-30 19:11:07 +0000 (Mon, 30 May 2011) Log Message: ----------- mgar/trunk: added changelog.CSW Added Paths: ----------- csw/mgar/pkg/mgar/trunk/files/changelog.CSW Added: csw/mgar/pkg/mgar/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mgar/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mgar/trunk/files/changelog.CSW 2011-05-30 19:11:07 UTC (rev 14668) @@ -0,0 +1,5 @@ +mgar (0.91,REV=2011.05.30) + + * Initial release. + + -- Sebastian Kayser <skayser at opencsw.org> Mon, 30 May 2011 21:09:44 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon May 30 21:56:19 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 30 May 2011 20:56:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE3E870.6070005@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> Message-ID: <BANLkTik337OEwkMBG4ALT19_EPCW2jDH3g@mail.gmail.com> This is John's email, which didn't make it to the list (I think that John is not subscribed to devel@). 2011/5/30 John Ellson <ellson at opencsw.org>: >> If you have any questions, please ask! >> >> Thanks, >> Maciej > > Yes, ?basically this is getting to be too much work. ? There isn't that much change in graphviz that it should be this hard. > > Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? > > Isn't there some preliminary checking that could be done during the build on the first platform? > > Aren't most of the dependencies automatically derivable? > > I don't understand the dynamic library problems ... ? I'm used to having libtool take care of it all. ? Whats this Rpath stuff? ?Doesn't OpenCSW automatically have /opt/csw/lib in its library path? ?(I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. ?Fedora doesn't use Rpath at all. ?Whats the difference?) > > I'm sure Imagemagick just needs a rebuild. ? ?I'd do that except, no way, not with this kind of hassle during the packaging process. > > Personally I'd like to avoid multiple library versions installed in parallel. ?It can be a support nightmare. > > > John > > > On 05/30/2011 11:52 AM, Maciej Blizi?ski wrote: >> Hi John, >> >> Here's a review of the change you submitted to the code repository. >> There are some overrides that I suspect might be actual problems with >> the packages. ?There could be overrides that you put in because you >> have verified that checkpkg returned false positives. ?If this is the >> case, could you point these out? ?This way, we could improve checkpkg >> and reduce the rate of false positives. >> >> More comments below. >> >> 2011/5/30 ?<ellson at users.sourceforge.net>: >>> Revision: 14667 >>> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=14667&view=rev >>> Author: ? ellson >>> Date: ? ? 2011-05-30 14:54:34 +0000 (Mon, 30 May 2011) >>> >>> Log Message: >>> ----------- >>> graphviz: why aren't transitive dependencies handled automatically? >>> >>> Modified Paths: >>> -------------- >>> ? ?csw/mgar/pkg/graphviz/trunk/Makefile >>> >>> Modified: csw/mgar/pkg/graphviz/trunk/Makefile >>> =================================================================== >>> --- csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-30 11:23:50 UTC (rev 14666) >>> +++ csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-30 14:54:34 UTC (rev 14667) >>> @@ -62,24 +62,28 @@ >>> ?BUILD_DEP_PKGS = >>> >>> ?RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ >>> - ? ? ? CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ >>> - ? ? ? CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg >>> + ? ? ? CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ >>> + ? ? ? CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg \ >>> + ? ? ? CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 >>> ?RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz >>> ?RUNTIME_DEP_PKGS_CSWgraphvizdoc = >>> ?RUNTIME_DEP_PKGS_CSWgraphvizgraphs = >>> -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWgraphviz >>> -RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil >>> -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWgraphviz CSWzlib >>> -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile >>> -RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava >>> -RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua >>> -RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml >>> -RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl >>> -RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 >>> -RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWgraphviz CSWzlib >>> -RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr >>> -RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby >>> -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz >>> +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ >>> + ? ? ? CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ >>> + ? ? ? CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz >> At OpenCSW, we use += to append to variables: >> >> RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd (...) >> RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpango CSWlibintl8 (...) >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl >> This is probably OK to override, especially since it's a demo. But if >> you notice /usr/local inside binaries, it's worth investigating >> (hardcoded paths ? potential bugs). >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >> Are you sure this is safe to override? ?Are these loaded via dlopen so >> RPATH doesn't matter? >>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono >> If you have an idea how checkpkg can detect a dependency on CSWmono, >> we could make this one go away. >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>> +CHECKPKG_OVERRIDES_CSWgraphviz2 += surplus-dependency|CSWgraphviz >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWglib2 >> Why this override, are you sure that overriding this is the right thing to do? >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWgd >> Is this dependency actually needed? >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWexpat >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWxpm >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWzlib >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWftype2 >> checkpkg likely gave explenations why these dependencies are required. >> ?Can you look at these? ?It might turn out that not having them is a >> bug. >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibltdl7 >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWiconv >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWgts >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpango >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibintl8 >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpng >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWfconfig >>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibcairo >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibcairo >> Are you sure these dependencies are not needed? >> >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWtcl >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWfconfig >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3corert|or|CSWgcc4corert >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWpango >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWftype2 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgts >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/tcldot.3tcl >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtclplan.so.0.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot_builtin.so.0.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtkspline.so.0.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libgv_tcl.so >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibltdl7 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWexpat >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3g++rt|or|CSWgcc4g++rt >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibintl8 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWglib2 >>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWzlib >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static >>> +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += non-uniform-lib-versions-in-package|sonames=libcdt.so.5,libcgraph.so.6,libgraph.so.5,libgvc.so.6,libgvpr.so.2,libpathplan.so.4,libxdot.so.4 >> Since libgvc.so.6 supersedes libgvc.so.5, you need to take care to >> include the libgvc.so.5 file as well. ?I would suggest splitting the >> shared libraries, to help with shared libraries in the future. >> libgvc.so.5 could be packaged as CSWlibgvc5 and libgvc.so.6 as >> CSWlibgvc6. >> >> From looking at the package database, libgvc.so.5 is required for >> imagemagick to work, so you need to take care not to break it. >> >> I would suggest creating the following dependency chain: >> >> CSWimagemagick ? CSWgraphviz ? CSWlibgvc5 >> >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 >>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/FAQ.html >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/FAQ.html >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/ChangeLog >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/winbuild.html >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/build.html >>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/info/command.html >> Since it's a doc package, you can substitue all the specific overrides >> with one general override: >> >> CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content >> >> It will apply to all the instances of the file-with-bad-content error >> for the CSWgraphvizdoc package. >> >>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >> These are essentially repetitions of the previous errors. >> >> Generally, I would suggest scrolling up (checkpkg output is probably >> quite long) and reading explanations that checkpkg gives. For >> instance, if you see soname-not-found, checkpkg will explain why is it >> not found, what is the RPATH, and where are the files that could be >> found. ?For other errors, checkpkg tries to give additional details to >> help figure out what is the exact problem that checkpkg reports. >> >> If you have any questions, please ask! >> >> Thanks, >> Maciej >> > > From ellson at opencsw.org Mon May 30 22:04:38 2011 From: ellson at opencsw.org (John Ellson) Date: Mon, 30 May 2011 16:04:38 -0400 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <BANLkTik337OEwkMBG4ALT19_EPCW2jDH3g@mail.gmail.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTik337OEwkMBG4ALT19_EPCW2jDH3g@mail.gmail.com> Message-ID: <4DE3F856.8010803@opencsw.org> I'm subscribed now. Still feeling cranky though ;-( John On 05/30/2011 03:56 PM, Maciej Blizi?ski wrote: > This is John's email, which didn't make it to the list (I think that > John is not subscribed to devel@). > > 2011/5/30 John Ellson <ellson at opencsw.org>: >>> If you have any questions, please ask! >>> >>> Thanks, >>> Maciej >> Yes, basically this is getting to be too much work. There isn't that much change in graphviz that it should be this hard. >> >> Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? >> >> Isn't there some preliminary checking that could be done during the build on the first platform? >> >> Aren't most of the dependencies automatically derivable? >> >> I don't understand the dynamic library problems ... I'm used to having libtool take care of it all. Whats this Rpath stuff? Doesn't OpenCSW automatically have /opt/csw/lib in its library path? (I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. Fedora doesn't use Rpath at all. Whats the difference?) >> >> I'm sure Imagemagick just needs a rebuild. I'd do that except, no way, not with this kind of hassle during the packaging process. >> >> Personally I'd like to avoid multiple library versions installed in parallel. It can be a support nightmare. >> >> >> John >> >> >> On 05/30/2011 11:52 AM, Maciej Blizi?ski wrote: >>> Hi John, >>> >>> Here's a review of the change you submitted to the code repository. >>> There are some overrides that I suspect might be actual problems with >>> the packages. There could be overrides that you put in because you >>> have verified that checkpkg returned false positives. If this is the >>> case, could you point these out? This way, we could improve checkpkg >>> and reduce the rate of false positives. >>> >>> More comments below. >>> >>> 2011/5/30 <ellson at users.sourceforge.net>: >>>> Revision: 14667 >>>> http://gar.svn.sourceforge.net/gar/?rev=14667&view=rev >>>> Author: ellson >>>> Date: 2011-05-30 14:54:34 +0000 (Mon, 30 May 2011) >>>> >>>> Log Message: >>>> ----------- >>>> graphviz: why aren't transitive dependencies handled automatically? >>>> >>>> Modified Paths: >>>> -------------- >>>> csw/mgar/pkg/graphviz/trunk/Makefile >>>> >>>> Modified: csw/mgar/pkg/graphviz/trunk/Makefile >>>> =================================================================== >>>> --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 11:23:50 UTC (rev 14666) >>>> +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 14:54:34 UTC (rev 14667) >>>> @@ -62,24 +62,28 @@ >>>> BUILD_DEP_PKGS = >>>> >>>> RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ >>>> - CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ >>>> - CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg >>>> + CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ >>>> + CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg \ >>>> + CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 >>>> RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz >>>> RUNTIME_DEP_PKGS_CSWgraphvizdoc = >>>> RUNTIME_DEP_PKGS_CSWgraphvizgraphs = >>>> -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWgraphviz >>>> -RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil >>>> -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWgraphviz CSWzlib >>>> -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile >>>> -RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava >>>> -RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua >>>> -RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml >>>> -RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl >>>> -RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 >>>> -RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWgraphviz CSWzlib >>>> -RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr >>>> -RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby >>>> -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz >>>> +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ >>>> + CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ >>>> + CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz >>> At OpenCSW, we use += to append to variables: >>> >>> RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd (...) >>> RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpango CSWlibintl8 (...) >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl >>> This is probably OK to override, especially since it's a demo. But if >>> you notice /usr/local inside binaries, it's worth investigating >>> (hardcoded paths ? potential bugs). >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >>> Are you sure this is safe to override? Are these loaded via dlopen so >>> RPATH doesn't matter? >>>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono >>> If you have an idea how checkpkg can detect a dependency on CSWmono, >>> we could make this one go away. >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so >>>> +CHECKPKG_OVERRIDES_CSWgraphviz2 += surplus-dependency|CSWgraphviz >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWglib2 >>> Why this override, are you sure that overriding this is the right thing to do? >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWgd >>> Is this dependency actually needed? >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWexpat >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWxpm >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWzlib >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWftype2 >>> checkpkg likely gave explenations why these dependencies are required. >>> Can you look at these? It might turn out that not having them is a >>> bug. >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibltdl7 >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWiconv >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWgts >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpango >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibintl8 >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpng >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWfconfig >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibcairo >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibcairo >>> Are you sure these dependencies are not needed? >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWtcl >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWfconfig >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3corert|or|CSWgcc4corert >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWpango >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWftype2 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgts >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/tcldot.3tcl >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtclplan.so.0.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot_builtin.so.0.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtkspline.so.0.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libgv_tcl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibltdl7 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWexpat >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3g++rt|or|CSWgcc4g++rt >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibintl8 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWglib2 >>>> +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWzlib >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += non-uniform-lib-versions-in-package|sonames=libcdt.so.5,libcgraph.so.6,libgraph.so.5,libgvc.so.6,libgvpr.so.2,libpathplan.so.4,libxdot.so.4 >>> Since libgvc.so.6 supersedes libgvc.so.5, you need to take care to >>> include the libgvc.so.5 file as well. I would suggest splitting the >>> shared libraries, to help with shared libraries in the future. >>> libgvc.so.5 could be packaged as CSWlibgvc5 and libgvc.so.6 as >>> CSWlibgvc6. >>> >>> From looking at the package database, libgvc.so.5 is required for >>> imagemagick to work, so you need to take care not to break it. >>> >>> I would suggest creating the following dependency chain: >>> >>> CSWimagemagick ? CSWgraphviz ? CSWlibgvc5 >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 >>>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/FAQ.html >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/FAQ.html >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/ChangeLog >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/winbuild.html >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/build.html >>>> +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/info/command.html >>> Since it's a doc package, you can substitue all the specific overrides >>> with one general override: >>> >>> CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content >>> >>> It will apply to all the instances of the file-with-bad-content error >>> for the CSWgraphvizdoc package. >>> >>>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >>>> +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so >>> These are essentially repetitions of the previous errors. >>> >>> Generally, I would suggest scrolling up (checkpkg output is probably >>> quite long) and reading explanations that checkpkg gives. For >>> instance, if you see soname-not-found, checkpkg will explain why is it >>> not found, what is the RPATH, and where are the files that could be >>> found. For other errors, checkpkg tries to give additional details to >>> help figure out what is the exact problem that checkpkg reports. >>> >>> If you have any questions, please ask! >>> >>> Thanks, >>> Maciej >>> >> From maciej at opencsw.org Mon May 30 22:32:20 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 30 May 2011 21:32:20 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE3E870.6070005@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> Message-ID: <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> 2011/5/30 John Ellson <ellson at opencsw.org>: >> If you have any questions, please ask! >> >> Thanks, >> Maciej > > Yes, ?basically this is getting to be too much work. ? There isn't that much change in graphviz that it should be this hard. First, thank you for your effort in maintaining the graphviz package. Everybody appreciates that. It sometimes happens that a maintainer gets overwhelmed by problems they face. We find that teamwork is a great in these cases, where each person can solve parts of the problem. We'll look at graphviz together. As far as changes go, it's more about changes in our policy and the introduction of new checks that's at play, rather than changes in graphviz. At times, issues with packages go unnoticed, until they are examined by checkpkg. We've so far corrected many issues with both missing and surplus dependencies, even though packages looked okay before. There is also a possibility of getting false positives, in which case overrides can be put in place. > Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? > > Isn't there some preliminary checking that could be done during the build on the first platform? Yes, there is a preliminary check, you should see the outcome after running "mgar package" or "mgar platforms". There can be scenarios in which you only see an error when uploading to unstable, but these would be related to things like differences between the 5.9 and 5.10 catalogs, which are rare. If your package were not checked right after building, then it's a bug and it should be investigated. Could you run something like (if you don't use mgar, then substitute 'gmake' for it): mgar repackage 2>&1 | tee ~/graphviz-build.log > Aren't most of the dependencies automatically derivable? They are verifiable, but we do not have a code that would automatically wire package dependencies. > I don't understand the dynamic library problems ... ? I'm used to having libtool take care of it all. ? Whats this Rpath stuff? ?Doesn't OpenCSW automatically have /opt/csw/lib in its library path? ?(I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. ?Fedora doesn't use Rpath at all. ?Whats the difference?) It's one of the differences between Solaris and Linux. On Linux, there is ld.so.conf. It allows you to specify directories in which to look for shared libraries. On Solaris, ld.so.conf is unavailable, so each binary needs to have that list of directories. > I'm sure Imagemagick just needs a rebuild. ? ?I'd do that except, no way, not with this kind of hassle during the packaging process. It would be hard to do without having a window of time when imagemagic is broken. We would probably want to avoid that. There is a couple of ways around it, such as installing updated graphviz libraries before they're released, and then releasing updated graphviz and imagemagic at the same time. It's not the cleanest way to do this though. > Personally I'd like to avoid multiple library versions installed in parallel. ?It can be a support nightmare. We've got that figured out, you can look up the wiki page about shared libraries if you're curious how. Maciej [1] http://wiki.opencsw.org/packaging-shared-libraries From wbonnet at users.sourceforge.net Mon May 30 22:36:10 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 30 May 2011 20:36:10 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[372] web/wordpresscsw/wp-content/themes/opencsw/ searchFilesAndPackages.php Message-ID: <E1QR9C6-0001AC-2j@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 372 http://opencsw.svn.sourceforge.net/opencsw/?rev=372&view=rev Author: wbonnet Date: 2011-05-30 20:36:09 +0000 (Mon, 30 May 2011) Log Message: ----------- ~Fix role=searchvi Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/searchFilesAndPackages.php Modified: web/wordpresscsw/wp-content/themes/opencsw/searchFilesAndPackages.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/searchFilesAndPackages.php 2011-04-18 22:48:33 UTC (rev 371) +++ web/wordpresscsw/wp-content/themes/opencsw/searchFilesAndPackages.php 2011-05-30 20:36:09 UTC (rev 372) @@ -18,7 +18,7 @@ <h3>Search files in the software list</h3> <div class="entry"> <p>You can search for a filename, or part of a filename, with this form.</p> - <form role="search" method="post" id="searchform" action="/packagesContainingFile" > + <form method="post" id="searchform" action="/packagesContainingFile" > <div class="search-filename-reader-text"> <label class="screen-reader-text">Filename : </label> <input type="text" value="" name="fileName" id="s" /> @@ -42,7 +42,7 @@ <h3>Search packages in the software list</h3> <div class="entry"> <p>If instead of searching for which package contains a filename, you wish to show all files contained in a particular package, you may use this search instead.</p> - <form role="search" method="post" id="searchform" action="/filesInPackage" > + <form method="post" id="searchform" action="/filesInPackage" > <div> <label class="screen-reader-text">Package : </label> <input type="text" value="" name="pkgName" id="s" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Mon May 30 23:09:09 2011 From: ellson at opencsw.org (John Ellson) Date: Mon, 30 May 2011 17:09:09 -0400 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> Message-ID: <4DE40775.9060303@opencsw.org> On 05/30/2011 04:32 PM, Maciej Blizi?ski wrote: > 2011/5/30 John Ellson <ellson at opencsw.org>: >>> If you have any questions, please ask! >>> >>> Thanks, >>> Maciej >> Yes, basically this is getting to be too much work. There isn't that much change in graphviz that it should be this hard. > First, thank you for your effort in maintaining the graphviz package. > Everybody appreciates that. It sometimes happens that a maintainer > gets overwhelmed by problems they face. We find that teamwork is a > great in these cases, where each person can solve parts of the > problem. We'll look at graphviz together. Thanks. Sorry for being cranky. > As far as changes go, it's more about changes in our policy and the > introduction of new checks that's at play, rather than changes in > graphviz. At times, issues with packages go unnoticed, until they are > examined by checkpkg. We've so far corrected many issues with both > missing and surplus dependencies, even though packages looked okay > before. There is also a possibility of getting false positives, in > which case overrides can be put in place. > >> Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? >> >> Isn't there some preliminary checking that could be done during the build on the first platform? > Yes, there is a preliminary check, you should see the outcome after > running "mgar package" or "mgar platforms". There can be scenarios in > which you only see an error when uploading to unstable, but these > would be related to things like differences between the 5.9 and 5.10 > catalogs, which are rare. > > If your package were not checked right after building, then it's a bug > and it should be investigated. Could you run something like (if you > don't use mgar, then substitute 'gmake' for it): > > mgar repackage 2>&1 | tee ~/graphviz-build.log I did: ssh current9s cd /home/ellson/mgar/pkg/graphviz/trunk gmake repackage 2>&1 | tee ~/graphviz-build.log See attached. I don't see anything like the same packaging errors in it. >> Aren't most of the dependencies automatically derivable? > They are verifiable, but we do not have a code that would > automatically wire package dependencies. > >> I don't understand the dynamic library problems ... I'm used to having libtool take care of it all. Whats this Rpath stuff? Doesn't OpenCSW automatically have /opt/csw/lib in its library path? (I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. Fedora doesn't use Rpath at all. Whats the difference?) > It's one of the differences between Solaris and Linux. On Linux, > there is ld.so.conf. It allows you to specify directories in which to > look for shared libraries. On Solaris, ld.so.conf is unavailable, so > each binary needs to have that list of directories. OK, but graphviz-2.26.3 doesn't have any problems with its plugins. e.g.: echo "digraph {hello -> world}" | dot -v -Tgif >hello.gif uses the gd plugin from graphviz-gd. The plugins do use dlopen, but the plugin libs depend on other libs. ldd /opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 show that the plugins find all their dependencies OK (no LD_LIBRARY_PATH set). >> I'm sure Imagemagick just needs a rebuild. I'd do that except, no way, not with this kind of hassle during the packaging process. > It would be hard to do without having a window of time when imagemagic > is broken. We would probably want to avoid that. There is a couple > of ways around it, such as installing updated graphviz libraries > before they're released, and then releasing updated graphviz and > imagemagic at the same time. It's not the cleanest way to do this > though. This seems to be a more general issue. It should be possible to rebuild a set of packages and release them all at once. >> Personally I'd like to avoid multiple library versions installed in parallel. It can be a support nightmare. > We've got that figured out, you can look up the wiki page about shared > libraries if you're curious how. Mmm, with 5 differnt orthogonal numbering schemes. Complexity on complexity. OK, I'm still feeling cranky. It wouldn't be so bad if this was the only problem. > Maciej > > [1] http://wiki.opencsw.org/packaging-shared-libraries > -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: graphviz-build.log URL: <http://lists.opencsw.org/pipermail/devel/attachments/20110530/afac55fa/attachment-0001.log> From skayser at users.sourceforge.net Mon May 30 23:57:13 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 30 May 2011 21:57:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14669] csw/mgar/pkg/ipv6calc/trunk Message-ID: <E1QRASX-0002Tr-4x@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14669 http://gar.svn.sourceforge.net/gar/?rev=14669&view=rev Author: skayser Date: 2011-05-30 21:57:12 +0000 (Mon, 30 May 2011) Log Message: ----------- ipv6calc/trunk: fix missing -lsocket/-lnsl in ./configure, override gcc'isms Modified Paths: -------------- csw/mgar/pkg/ipv6calc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch Modified: csw/mgar/pkg/ipv6calc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ipv6calc/trunk/Makefile 2011-05-30 19:11:07 UTC (rev 14668) +++ csw/mgar/pkg/ipv6calc/trunk/Makefile 2011-05-30 21:57:12 UTC (rev 14669) @@ -1,7 +1,9 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -# ! ./configure fails, check for GeoIP doesn't include -lsocket +# ! Final linking fails +# /opt/SUNWspro/bin/cc -m32 -xarch=386 -L/opt/csw/lib -o ipv6calc ipv6calc.o showinfo.o ../getopt/getopt.o ../getopt/getopt1.o ../md5/md5.o -lipv6calc -L../lib/ -L/opt/csw/lib -lGeoIP +# ld: fatal: library -lipv6calc: not found # NAME = ipv6calc VERSION = 0.90.0 @@ -22,9 +24,19 @@ MASTER_SITES = ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-geoip CONFIGURE_ARGS += --with-geoip-headers=$(includedir) CONFIGURE_ARGS += --with-geoip-lib=$(libdir) +# ipv6calc pre-sets DEFAULT_CFLAGS with gcc'isms, override these +BUILD_OVERRIDE_VARS = DEFAULT_CFLAGS +DEFAULT_CFLAGS = + include gar/category.mk + +pre-configure-modulated: + @cd $(WORKSRC) && autoreconf -fi + @$(MAKECOOKIE) Added: csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch =================================================================== --- csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch (rev 0) +++ csw/mgar/pkg/ipv6calc/trunk/files/0001-Include-lsocket-and-lnsl-in-.-configure-checks.patch 2011-05-30 21:57:12 UTC (rev 14669) @@ -0,0 +1,27 @@ +From be2bfae944d34f4aeee1126c2a345981142ba4ca Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser <skayser at opencsw.org> +Date: Mon, 30 May 2011 23:41:36 +0200 +Subject: [PATCH] Include -lsocket and -lnsl in ./configure checks. + +--- + configure.in | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index d03e5a9..d42b43d 100644 +--- a/configure.in ++++ b/configure.in +@@ -44,6 +44,10 @@ AC_CHECK_FUNC(getopt_long, [], + AC_SUBST(GETOPT_INCLUDE) + AC_SUBST(ENABLE_BUNDLED_GETOPT) + ++dnl check for -lnsl, -lsocket ++AC_CHECK_FUNC(gethostbyname,,AC_CHECK_LIB(nsl, gethostbyname)) ++AC_CHECK_FUNC(socket,,AC_CHECK_LIB(socket, socket)) ++ + dnl IP2Location support + AC_ARG_ENABLE([ip2location], + AS_HELP_STRING([--enable-ip2location], +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue May 31 01:09:13 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 00:09:13 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE40775.9060303@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> Message-ID: <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> 2011/5/30 John Ellson <ellson at opencsw.org>: > On 05/30/2011 04:32 PM, Maciej Blizi?ski wrote: >> 2011/5/30 John Ellson <ellson at opencsw.org>: >>>> If you have any questions, please ask! >>>> >>>> Thanks, >>>> Maciej >>> Yes, ?basically this is getting to be too much work. ? There isn't that much change in graphviz that it should be this hard. >> First, thank you for your effort in maintaining the graphviz package. >> Everybody appreciates that. ?It sometimes happens that a maintainer >> gets overwhelmed by problems they face. ?We find that teamwork is a >> great in these cases, where each person can solve parts of the >> problem. ?We'll look at graphviz together. > > Thanks. ?Sorry for being cranky. >> As far as changes go, it's more about changes in our policy and the >> introduction of new checks that's at play, rather than changes in >> graphviz. ?At times, issues with packages go unnoticed, until they are >> examined by checkpkg. ?We've so far corrected many issues with both >> missing and surplus dependencies, even though packages looked okay >> before. There is also a possibility of getting false positives, in >> which case overrides can be put in place. >> >>> Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? >>> >>> Isn't there some preliminary checking that could be done during the build on the first platform? >> Yes, there is a preliminary check, you should see the outcome after >> running "mgar package" or "mgar platforms". ?There can be scenarios in >> which you only see an error when uploading to unstable, but these >> would be related to things like differences between the 5.9 and 5.10 >> catalogs, which are rare. >> >> If your package were not checked right after building, then it's a bug >> and it should be investigated. ?Could you run something like (if you >> don't use mgar, then substitute 'gmake' for it): >> >> mgar repackage 2>&1 | tee ~/graphviz-build.log > I did: > ? ?ssh current9s > ? ?cd /home/ellson/mgar/pkg/graphviz/trunk > ? ?gmake repackage 2>&1 | tee ~/graphviz-build.log > > See attached. ? ?I don't see anything like the same packaging errors in it. Reading through the build... I found out, why checkpkg wasn't run: # disable dependency checks because plugins depend on libs from base package ENABLE_CHECK = 0 The checks were simply disabled in the build. http://gar.svn.sourceforge.net/viewvc/gar/csw/mgar/pkg/graphviz/trunk/Makefile?view=markup&pathrev=14667 Lines 14 and 15. >>> Aren't most of the dependencies automatically derivable? >> They are verifiable, but we do not have a code that would >> automatically wire package dependencies. >> >>> I don't understand the dynamic library problems ... ? I'm used to having libtool take care of it all. ? Whats this Rpath stuff? ?Doesn't OpenCSW automatically have /opt/csw/lib in its library path? ?(I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. ?Fedora doesn't use Rpath at all. ?Whats the difference?) >> It's one of the differences between Solaris and Linux. ?On Linux, >> there is ld.so.conf. ?It allows you to specify directories in which to >> look for shared libraries. ?On Solaris, ld.so.conf is unavailable, so >> each binary needs to have that list of directories. > > OK, but graphviz-2.26.3 doesn't have any problems with its plugins. > > e.g.: > > ? ?echo "digraph {hello -> world}" | dot -v -Tgif >hello.gif > > uses the gd plugin from graphviz-gd. > > The plugins do use dlopen, but the plugin libs depend on other libs. > ? ?ldd /opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 > show that the plugins find all their dependencies OK (no LD_LIBRARY_PATH > set). Could you include the full output from ldd? Please make sure you run ldd on a test machine (if you have one) while your updated graphviz packages are installed. If you don't have a test system of your own, we can get you access to test9s. >>> I'm sure Imagemagick just needs a rebuild. ? ?I'd do that except, no way, not with this kind of hassle during the packaging process. >> It would be hard to do without having a window of time when imagemagic >> is broken. ?We would probably want to avoid that. ?There is a couple >> of ways around it, such as installing updated graphviz libraries >> before they're released, and then releasing updated graphviz and >> imagemagic at the same time. ?It's not the cleanest way to do this >> though. > > This seems to be a more general issue. ?It should be possible to rebuild > a set of packages and release them all at once. Yes, it's a general issue. It believe that it has been discussed at length on the mailing list in the past. There is a couple rules at play here: - packages need to be built on the buildfarm - you need to release a package before it can be installed on the buildfarm - you need to install a package on the buildfarm before you can rebuild another package against it - all the required shared libraries must be present in the catalog at all times You need to plan the rebuild so that these rules are preserved. >>> Personally I'd like to avoid multiple library versions installed in parallel. ?It can be a support nightmare. >> We've got that figured out, you can look up the wiki page about shared >> libraries if you're curious how. > > Mmm, with 5 differnt orthogonal numbering schemes. ?Complexity on > complexity. > > OK, I'm still feeling cranky. Yes, you seem to be. Thats OK, I imagine that it's not a pleasant experience to suddenly see that many reported errors against your package. I'm currently rebuilding graphviz on the buildfarm to examine the situation more closely. I'll wait for the ldd output on your test system. Thanks, Maciej From ellson at opencsw.org Tue May 31 01:38:37 2011 From: ellson at opencsw.org (John Ellson) Date: Mon, 30 May 2011 19:38:37 -0400 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> Message-ID: <4DE42A7D.5080705@opencsw.org> Maciej, Yes please to access to a test system. That would help a lot. I have access to lots of Fedora boxes locally, but only one Solaris box with opencsw, and it only has graphviz-2.26.3 release on it. I've attached the ldd output from the old release, if that's helpful? I should be very similar to the new release. In the attachment are the outputs from: echo $LD_LIBRARY_PATH ldd /opt/csw/bin/dot ldd /opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 John On 05/30/2011 07:09 PM, Maciej Blizi?ski wrote: > 2011/5/30 John Ellson <ellson at opencsw.org>: >> On 05/30/2011 04:32 PM, Maciej Blizi?ski wrote: >>> 2011/5/30 John Ellson <ellson at opencsw.org>: >>>>> If you have any questions, please ask! >>>>> >>>>> Thanks, >>>>> Maciej >>>> Yes, basically this is getting to be too much work. There isn't that much change in graphviz that it should be this hard. >>> First, thank you for your effort in maintaining the graphviz package. >>> Everybody appreciates that. It sometimes happens that a maintainer >>> gets overwhelmed by problems they face. We find that teamwork is a >>> great in these cases, where each person can solve parts of the >>> problem. We'll look at graphviz together. >> Thanks. Sorry for being cranky. >>> As far as changes go, it's more about changes in our policy and the >>> introduction of new checks that's at play, rather than changes in >>> graphviz. At times, issues with packages go unnoticed, until they are >>> examined by checkpkg. We've so far corrected many issues with both >>> missing and surplus dependencies, even though packages looked okay >>> before. There is also a possibility of getting false positives, in >>> which case overrides can be put in place. >>> >>>> Why do I have to spend an hour building this (admittedly large) package, without errors, only to get all these errors when trying to post it? >>>> >>>> Isn't there some preliminary checking that could be done during the build on the first platform? >>> Yes, there is a preliminary check, you should see the outcome after >>> running "mgar package" or "mgar platforms". There can be scenarios in >>> which you only see an error when uploading to unstable, but these >>> would be related to things like differences between the 5.9 and 5.10 >>> catalogs, which are rare. >>> >>> If your package were not checked right after building, then it's a bug >>> and it should be investigated. Could you run something like (if you >>> don't use mgar, then substitute 'gmake' for it): >>> >>> mgar repackage 2>&1 | tee ~/graphviz-build.log >> I did: >> ssh current9s >> cd /home/ellson/mgar/pkg/graphviz/trunk >> gmake repackage 2>&1 | tee ~/graphviz-build.log >> >> See attached. I don't see anything like the same packaging errors in it. > Reading through the build... I found out, why checkpkg wasn't run: > > # disable dependency checks because plugins depend on libs from base package > ENABLE_CHECK = 0 > > The checks were simply disabled in the build. > > http://gar.svn.sourceforge.net/viewvc/gar/csw/mgar/pkg/graphviz/trunk/Makefile?view=markup&pathrev=14667 > > Lines 14 and 15. > >>>> Aren't most of the dependencies automatically derivable? >>> They are verifiable, but we do not have a code that would >>> automatically wire package dependencies. >>> >>>> I don't understand the dynamic library problems ... I'm used to having libtool take care of it all. Whats this Rpath stuff? Doesn't OpenCSW automatically have /opt/csw/lib in its library path? (I mean, I know what Rpath is, but I don't know why its needed if libraries are stored in standard lib directories. Fedora doesn't use Rpath at all. Whats the difference?) >>> It's one of the differences between Solaris and Linux. On Linux, >>> there is ld.so.conf. It allows you to specify directories in which to >>> look for shared libraries. On Solaris, ld.so.conf is unavailable, so >>> each binary needs to have that list of directories. >> OK, but graphviz-2.26.3 doesn't have any problems with its plugins. >> >> e.g.: >> >> echo "digraph {hello -> world}" | dot -v -Tgif >hello.gif >> >> uses the gd plugin from graphviz-gd. >> >> The plugins do use dlopen, but the plugin libs depend on other libs. >> ldd /opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 >> show that the plugins find all their dependencies OK (no LD_LIBRARY_PATH >> set). > Could you include the full output from ldd? Please make sure you run > ldd on a test machine (if you have one) while your updated graphviz > packages are installed. If you don't have a test system of your own, > we can get you access to test9s. > >>>> I'm sure Imagemagick just needs a rebuild. I'd do that except, no way, not with this kind of hassle during the packaging process. >>> It would be hard to do without having a window of time when imagemagic >>> is broken. We would probably want to avoid that. There is a couple >>> of ways around it, such as installing updated graphviz libraries >>> before they're released, and then releasing updated graphviz and >>> imagemagic at the same time. It's not the cleanest way to do this >>> though. >> This seems to be a more general issue. It should be possible to rebuild >> a set of packages and release them all at once. > Yes, it's a general issue. It believe that it has been discussed at > length on the mailing list in the past. There is a couple rules at > play here: > > - packages need to be built on the buildfarm > - you need to release a package before it can be installed on the buildfarm > - you need to install a package on the buildfarm before you can > rebuild another package against it > - all the required shared libraries must be present in the catalog at all times > > You need to plan the rebuild so that these rules are preserved. > >>>> Personally I'd like to avoid multiple library versions installed in parallel. It can be a support nightmare. >>> We've got that figured out, you can look up the wiki page about shared >>> libraries if you're curious how. >> Mmm, with 5 differnt orthogonal numbering schemes. Complexity on >> complexity. >> >> OK, I'm still feeling cranky. > Yes, you seem to be. Thats OK, I imagine that it's not a pleasant > experience to suddenly see that many reported errors against your > package. I'm currently rebuilding graphviz on the buildfarm to > examine the situation more closely. I'll wait for the ldd output on > your test system. > > Thanks, > Maciej > -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: some_ldd_results_for_graphviz_2.26.3.txt URL: <http://lists.opencsw.org/pipermail/devel/attachments/20110530/c401941c/attachment.txt> From wahwah at users.sourceforge.net Tue May 31 01:58:36 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 May 2011 23:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14670] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRCM0-0000JH-Vz@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14670 http://gar.svn.sourceforge.net/gar/?rev=14670&view=rev Author: wahwah Date: 2011-05-30 23:58:36 +0000 (Mon, 30 May 2011) Log Message: ----------- pkg/graphviz/trunk: shared libraries split off, some dependencies adjusted Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 21:57:12 UTC (rev 14669) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 23:58:36 UTC (rev 14670) @@ -1,3 +1,8 @@ +# $Id$ +# +# There is still a number of errors thrown by checkpkg; they need to be +# investigated. + NAME = graphviz VERSION = 2.28.0 CATEGORIES = utils @@ -11,9 +16,6 @@ MASTER_SITES = http://www.graphviz.org/pub/graphviz/stable/SOURCES/ -# disable dependency checks because plugins depend on libs from base package -ENABLE_CHECK = 0 - GARCOMPILER = GCC4 PATCHFILES += configure.patch @@ -63,47 +65,56 @@ RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ - CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg \ + CSWlibatk CSWliblasi CSWzlib CSWxpm CSWlibrsvg \ CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibintl8 + RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcgraph6 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvpr2 RUNTIME_DEP_PKGS_CSWgraphvizdoc = RUNTIME_DEP_PKGS_CSWgraphvizgraphs = RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ - CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz + CSWgcc4corert CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgraph5 RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWlibcairo CSWfconfig CSWpango CSWftype2 CSWgts CSWlibintl8 \ CSWglib2 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgraph5 RUNTIME_DEP_PKGS_CSWgraphviz2 = CSWgraphviz -LICENSE_CSWgraphviz = COPYING -LICENSE_CSWgraphvizdevel = COPYING -LICENSE_CSWgraphvizdoc = COPYING -LICENSE_CSWgraphvizgraphs = COPYING -LICENSE_CSWgraphvizgd = COPYING -LICENSE_CSWgraphvizdevil = COPYING -LICENSE_CSWgraphvizsharp = COPYING -LICENSE_CSWgraphvizguile = COPYING -LICENSE_CSWgraphvizjava = COPYING -LICENSE_CSWgraphvizlua = COPYING -LICENSE_CSWgraphvizocaml = COPYING -LICENSE_CSWgraphvizperl = COPYING -LICENSE_CSWgraphvizphp = COPYING -LICENSE_CSWgraphvizpython = COPYING -LICENSE_CSWgraphvizr = COPYING -LICENSE_CSWgraphvizruby = COPYING -LICENSE_CSWgraphviztcl = COPYING -LICENSE_CSWgraphviz2 = COPYING +LICENSE = COPYING SPKG_DESC_CSWgraphviz = Graph Visualization Tools SPKG_DESC_CSWgraphvizdevel = Graphviz Headers etc. for development @@ -125,7 +136,6 @@ SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* -PKGFILES_CSWgraphviz += $(libdir)/lib.*\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gs\.so\..* @@ -203,14 +213,81 @@ PKGFILES_CSWgraphviz2 = $(prefix)/graphviz2 +# Shared libraries +PACKAGES += CSWlibcdt5 +CATALOGNAME_CSWlibcdt5 = libcdt5 +PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5\.0\.0) +PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibcdt5 += Graph Visualization Tools, libcdt.so.5 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWgcc4corert + +PACKAGES += CSWlibcgraph6 +CATALOGNAME_CSWlibcgraph6 = libcgraph6 +PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6\.0\.0) +PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibcgraph6 += Graph Visualization Tools, libcgraph.so.6 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcgraph6 +RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWgcc4corert + +PACKAGES += CSWlibgraph5 +CATALOGNAME_CSWlibgraph5 = libgraph5 +PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5\.0\.0) +PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibgraph5 += Graph Visualization Tools, libgraph.so.5 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWgcc4corert + +PACKAGES += CSWlibgvc6 +CATALOGNAME_CSWlibgvc6 = libgvc6 +PKGFILES_CSWlibgvc6 += $(call baseisadirs,$(libdir),libgvc\.so\.6\.0\.0) +PKGFILES_CSWlibgvc6 += $(call baseisadirs,$(libdir),libgvc\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibgvc6 += Graph Visualization Tools, libgvc.so.6 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWgcc4corert + +PACKAGES += CSWlibgvpr2 +CATALOGNAME_CSWlibgvpr2 = libgvpr2 +PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2\.0\.0) +PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibgvpr2 += Graph Visualization Tools, libgvpr.so.2 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvpr2 +RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWgcc4corert + +PACKAGES += CSWlibpathplan4 +CATALOGNAME_CSWlibpathplan4 = libpathplan4 +PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4\.0\.0) +PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibpathplan4 += Graph Visualization Tools, libpathplan.so.4 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWgcc4corert + +PACKAGES += CSWlibxdot4 +CATALOGNAME_CSWlibxdot4 = libxdot4 +PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4\.0\.0) +PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibxdot4 += Graph Visualization Tools, libxdot.so.4 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWgcc4corert + DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWgraphviz.postinstall DISTFILES += CSWgraphvizgd.postinstall CSWgraphvizgd.postuninstall DISTFILES += CSWgraphvizdevil.postinstall CSWgraphvizdevil.postuninstall -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-sfdp CONFIGURE_ARGS += --without-smyrna @@ -236,93 +313,19 @@ STRIP_LIBTOOL=1 -TEST_SCRIPTS = custom +TEST_SCRIPTS = +# It's a known problem with the tcl library. +CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content + +# checkpkg can't detect a dependency on CSWmono +CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono + +# /usr/local references from the docs are allright +CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content + include gar/category.mk -test-custom: - @echo " ==> Testing $(NAME) (custom)" - @$(MAKECOOKIE) - post-merge: gln -s . $(PKGROOT)$(prefix)/graphviz2 @$(MAKECOOKIE) - -CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphviz2 += surplus-dependency|CSWgraphviz -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWglib2 -CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWgd -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWexpat -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWxpm -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWftype2 -CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibltdl7 -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWiconv -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWgts -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpango -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWpng -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWfconfig -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibcairo -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibcairo -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWtcl -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWfconfig -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3corert|or|CSWgcc4corert -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWpango -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWftype2 -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgts -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/tcldot.3tcl -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtclplan.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtcldot_builtin.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libtkspline.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibltdl7 -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWexpat -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWgcc3g++rt|or|CSWgcc4g++rt -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWglib2 -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static -CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += non-uniform-lib-versions-in-package|sonames=libcdt.so.5,libcgraph.so.6,libgraph.so.5,libgvc.so.6,libgvpr.so.2,libpathplan.so.4,libxdot.so.4 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/FAQ.html -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/FAQ.html -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/ChangeLog -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/winbuild.html -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/doc/html/build.html -CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/doc/html/info/command.html -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so - Property changes on: csw/mgar/pkg/graphviz/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue May 31 02:03:26 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 01:03:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE42A7D.5080705@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> Message-ID: <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > Maciej, > > Yes please to access to a test system. ?That would help a lot. ? I have > access to lots of Fedora boxes locally, but only one Solaris box with > opencsw, and it only has graphviz-2.26.3 release on it. Cool, I sent an email to the buildfarm admins to grant you access to these zones. > I've attached the ldd output from the old release, if that's helpful? > I should be very similar to the new release. > In the attachment are the outputs from: > ? ? ?echo $LD_LIBRARY_PATH > ? ? ?ldd ?/opt/csw/bin/dot > ? ? ?ldd ?/opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 The output will also be similar, but to get a solid test result, you need to try it out after uninstalling the older graphviz packages and installing the new ones. In the meantime, I've submitted the a change to the graphviz build recipe: - Removed the "ENABLE_CHECK = 0" line - Removed most of the overrides - Split off shared libraries to own packages (used the code generated by checkpkg) - Adjusted a number of dependencies (both missing and surplus) Let's wait for the reply from the buildfarm admins. Maciej From ellson at opencsw.org Tue May 31 02:44:20 2011 From: ellson at opencsw.org (John Ellson) Date: Mon, 30 May 2011 20:44:20 -0400 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> Message-ID: <4DE439E4.7050008@opencsw.org> On 05/30/2011 08:03 PM, Maciej Blizi?ski wrote: > In the meantime, I've submitted the a change to the graphviz build recipe: > > - Removed the "ENABLE_CHECK = 0" line > - Removed most of the overrides > - Split off shared libraries to own packages (used the code generated > by checkpkg) > - Adjusted a number of dependencies (both missing and surplus) Thanks. OK, but won't this "splitting off shared libraries" also need to be done to graphviz-2.26.3 if the goal is to retain the older libs for use by ImageMagic? Re: CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so ... and 29 similar soname-not-found messgaes If I add these overrides for soname-not found (not found because the soname is in the new packages) will that actually suppress future checks, or do the check messages still occur but the package is allowed to proceed? In this case, I really want to say that these sonames are provided, so don't bug me! (Thats probably why I had ENABLE_CHECK=0) Of course, it would be better if checkpkg actually noticed by itself that they were being provided. John From ellson at users.sourceforge.net Tue May 31 03:45:15 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 01:45:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14671] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRE1D-00036A-Bn@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14671 http://gar.svn.sourceforge.net/gar/?rev=14671&view=rev Author: ellson Date: 2011-05-31 01:45:15 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: unfolding wrapped lines and using += construct. arrange by PACKAGE Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-30 23:58:36 UTC (rev 14670) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 01:45:15 UTC (rev 14671) @@ -16,6 +16,8 @@ MASTER_SITES = http://www.graphviz.org/pub/graphviz/stable/SOURCES/ +LICENSE = COPYING + GARCOMPILER = GCC4 PATCHFILES += configure.patch @@ -25,116 +27,45 @@ PATCHFILES += gvpr_Makefile.am.patch PATCHFILES += gv_Makefile.am.patch -PACKAGES = CSWgraphviz \ - CSWgraphvizdevel \ - CSWgraphvizdoc \ - CSWgraphvizgraphs \ - CSWgraphvizgd \ - CSWgraphvizsharp \ - CSWgraphvizguile \ - CSWgraphvizperl \ - CSWgraphvizpython \ - CSWgraphviztcl - -# CSWgraphvizdevil \ -# CSWgraphvizjava \ -# CSWgraphvizlua \ -# CSWgraphvizocaml \ -# CSWgraphvizphp \ -# CSWgraphvizr \ -# CSWgraphvizruby \ -# - INCOMPATIBLE_PKGS = CSWgraphvis - -# This is a compatibility package which should go away after some time. -# It only contains a link to CSWgraphviz. -PACKAGES += CSWgraphviz2 - # defer for some time to allow CSWgraphviz2 upgrades # INCOMPATIBLE_PKGS = CSWgraphviz2 -ARCHALL_CSWgraphvizdoc = 1 -ARCHALL_CSWgraphvizgraphs = 1 -ARCHALL_CSWgraphviz2 = 1 - # Waiting for liblasi, gts, gd, ghostscript and tcl/tk #BUILD64 = 1 BUILD_DEP_PKGS = -RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ - CSWgs CSWfconfig CSWftype2 CSWglib2 CSWgtk2 CSWiconv \ - CSWlibatk CSWliblasi CSWzlib CSWxpm CSWlibrsvg \ - CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibintl8 - -RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgraph5 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcdt5 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvc6 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcgraph6 -RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvpr2 -RUNTIME_DEP_PKGS_CSWgraphvizdoc = -RUNTIME_DEP_PKGS_CSWgraphvizgraphs = -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWglib2 CSWxpm CSWftype2 CSWiconv CSWgts \ - CSWpango CSWlibintl8 CSWpng CSWfconfig CSWlibcairo CSWexpat CSWzlib \ - CSWgcc4corert CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcdt5 -RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgraph5 -RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWlibcairo CSWfconfig CSWpango CSWftype2 CSWgts CSWlibintl8 \ - CSWglib2 CSWexpat CSWzlib CSWgcc4corert CSWgcc4g++rt CSWlibltdl7 CSWgraphviz -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcdt5 -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4 -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4 -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgraph5 +# This is a compatibility package which should go away after some time. +# It only contains a link to CSWgraphviz. +PACKAGES += CSWgraphviz2 +SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package RUNTIME_DEP_PKGS_CSWgraphviz2 = CSWgraphviz +PKGFILES_CSWgraphviz2 = $(prefix)/graphviz2 +ARCHALL_CSWgraphviz2 = 1 -LICENSE = COPYING - +PACKAGES += CSWgraphviz SPKG_DESC_CSWgraphviz = Graph Visualization Tools -SPKG_DESC_CSWgraphvizdevel = Graphviz Headers etc. for development -SPKG_DESC_CSWgraphvizdoc = Graphviz documentation -SPKG_DESC_CSWgraphvizgraphs = Graphviz example graphs -SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd -SPKG_DESC_CSWgraphvizdevil = Graphviz renderers using DevIL -SPKG_DESC_CSWgraphvizsharp = Graphviz language binding for C# -SPKG_DESC_CSWgraphvizguile = Graphviz language binding for guile -SPKG_DESC_CSWgraphvizjava = Graphviz language binding for java -SPKG_DESC_CSWgraphvizlua = Graphviz language binding for lua -SPKG_DESC_CSWgraphvizocaml = Graphviz language binding for ocaml -SPKG_DESC_CSWgraphvizperl = Graphviz language binding for perl -SPKG_DESC_CSWgraphvizphp = Graphviz language binding for php -SPKG_DESC_CSWgraphvizpython = Graphviz language binding for python -SPKG_DESC_CSWgraphvizr = Graphviz language binding for R -SPKG_DESC_CSWgraphvizruby = Graphviz language binding for ruby -SPKG_DESC_CSWgraphviztcl = Graphviz language binding for tcl -SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package - +RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat +RUNTIME_DEP_PKGS_CSWgraphviz += CSWpango +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgraphviz += CSWgts +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgraphviz += CSWgs +RUNTIME_DEP_PKGS_CSWgraphviz += CSWfconfig +RUNTIME_DEP_PKGS_CSWgraphviz += CSWftype2 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWglib2 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWiconv +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibatk +RUNTIME_DEP_PKGS_CSWgraphviz += CSWliblasi +RUNTIME_DEP_PKGS_CSWgraphviz += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphviz += CSWxpm +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibrsvg +RUNTIME_DEP_PKGS_CSWgraphviz += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphviz += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibintl8 PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* @@ -149,61 +80,232 @@ PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1 PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7 +PACKAGES += CSWgraphvizdevel +SPKG_DESC_CSWgraphvizdevel = Graphviz Headers etc. for development + +RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcgraph6 +RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvpr2 PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc PKGFILES_CSWgraphvizdevel += $(libdir)/lib.*\.so PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3 +PACKAGES += CSWgraphvizdoc +SPKG_DESC_CSWgraphvizdoc = Graphviz documentation +ARCHALL_CSWgraphvizdoc = 1 +RUNTIME_DEP_PKGS_CSWgraphvizdoc = PKGFILES_CSWgraphvizdoc = $(sharedstatedir)/graphviz/doc/.* +PACKAGES += CSWgraphvizgraphs +SPKG_DESC_CSWgraphvizgraphs = Graphviz example graphs +ARCHALL_CSWgraphvizgraphs = 1 +RUNTIME_DEP_PKGS_CSWgraphvizgraphs = PKGFILES_CSWgraphvizgraphs = $(sharedstatedir)/graphviz/graphs/.* +PACKAGES += CSWgraphvizgd +SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWftype2 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWiconv +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgts +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpango +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpng +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWfconfig +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgraph5 PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\.so\..* PKGFILES_CSWgraphvizgd += $(bindir)/diffimg PKGFILES_CSWgraphvizgd += $(bindir)/dot_static +#PACKAGES += CSWgraphvizdevil +SPKG_DESC_CSWgraphvizdevil = Graphviz renderers using DevIL +RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWgraphviz PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\.so\..* +PACKAGES += CSWgraphvizsharp +SPKG_DESC_CSWgraphvizsharp = Graphviz language binding for C# +RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4 PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.* PKGFILES_CSWgraphvizsharp += $(mandir)/man3/.*\.3sharp PKGFILES_CSWgraphvizsharp += $(sharedstatedir)/graphviz/demo/.*\.cs +PACKAGES += CSWgraphvizguile +SPKG_DESC_CSWgraphvizguile = Graphviz language binding for guile +RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4 PKGFILES_CSWgraphvizguile = $(libdir)/graphviz/guile/.* PKGFILES_CSWgraphvizguile += $(mandir)/man3/.*\.3guile PKGFILES_CSWgraphvizguile += $(sharedstatedir)/graphviz/demo/.*\.guile +#PACKAGES += CSWgraphvizjava +SPKG_DESC_CSWgraphvizjava = Graphviz language binding for java +RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgraphviz PKGFILES_CSWgraphvizjava = $(libdir)/graphviz/java/.* PKGFILES_CSWgraphvizjava += $(mandir)/man3/.*\.3java PKGFILES_CSWgraphvizjava += $(sharedstatedir)/graphviz/demo/.*\.java +#PACKAGES += CSWgraphvizlua +SPKG_DESC_CSWgraphvizlua = Graphviz language binding for lua +RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgraphviz PKGFILES_CSWgraphvizlua = $(libdir)/graphviz/lua/.* PKGFILES_CSWgraphvizlua += $(mandir)/man3/.*\.3lua PKGFILES_CSWgraphvizlua += $(sharedstatedir)/graphviz/demo/.*\.lua +#PACKAGES += CSWgraphvizocaml +SPKG_DESC_CSWgraphvizocaml = Graphviz language binding for ocaml +RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgraphviz PKGFILES_CSWgraphvizocaml = $(libdir)/graphviz/ocaml/.* PKGFILES_CSWgraphvizocaml += $(mandir)/man3/.*\.3ocaml PKGFILES_CSWgraphvizocaml += $(sharedstatedir)/graphviz/demo/.*\.ml +PACKAGES += CSWgraphvizperl +SPKG_DESC_CSWgraphvizperl = Graphviz language binding for perl +RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4 PKGFILES_CSWgraphvizperl = $(libdir)/graphviz/perl/.* PKGFILES_CSWgraphvizperl += $(mandir)/man3/.*\.3perl PKGFILES_CSWgraphvizperl += $(sharedstatedir)/graphviz/demo/.*\.pl +#PACKAGES += CSWgraphvizphp +SPKG_DESC_CSWgraphvizphp = Graphviz language binding for php +RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgraphviz PKGFILES_CSWgraphvizphp = $(libdir)/graphviz/php/.* PKGFILES_CSWgraphvizphp += $(mandir)/man3/.*\.3php PKGFILES_CSWgraphvizphp += $(sharedstatedir)/graphviz/demo/.*\.php +PACKAGES += CSWgraphvizpython +SPKG_DESC_CSWgraphvizpython = Graphviz language binding for python +RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4 PKGFILES_CSWgraphvizpython = $(libdir)/graphviz/python/.* PKGFILES_CSWgraphvizpython += $(mandir)/man3/.*\.3python PKGFILES_CSWgraphvizpython += $(sharedstatedir)/graphviz/demo/.*\.py +#PACKAGES += CSWgraphvizr +SPKG_DESC_CSWgraphvizr = Graphviz language binding for R +RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgraphviz PKGFILES_CSWgraphvizr = $(libdir)/graphviz/R/.* PKGFILES_CSWgraphvizr += $(mandir)/man3/.*\.3r PKGFILES_CSWgraphvizr += $(sharedstatedir)/graphviz/demo/.*\.r +#PACKAGES += CSWgraphvizruby +SPKG_DESC_CSWgraphvizruby = Graphviz language binding for ruby +RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgraphviz PKGFILES_CSWgraphvizruby = $(libdir)/graphviz/ruby/.* PKGFILES_CSWgraphvizruby += $(mandir)/man3/.*\.3ruby PKGFILES_CSWgraphvizruby += $(sharedstatedir)/graphviz/demo/.*\.rb +PACKAGES += CSWgraphviztcl +SPKG_DESC_CSWgraphviztcl = Graphviz language binding for tcl +RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWtk +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWfconfig +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpango +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWftype2 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgts +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWglib2 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgraph5 PKGFILES_CSWgraphviztcl = $(libdir)/graphviz/tcl/.* PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tcl PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tk @@ -211,8 +313,6 @@ PKGFILES_CSWgraphviztcl += $(sharedstatedir)/graphviz/demo/.*\.tcl.README PKGFILES_CSWgraphviztcl += $(sharedstatedir)/graphviz/demo/pathplan_data/.* -PKGFILES_CSWgraphviz2 = $(prefix)/graphviz2 - # Shared libraries PACKAGES += CSWlibcdt5 CATALOGNAME_CSWlibcdt5 = libcdt5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 03:55:11 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 01:55:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14672] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QREAp-0002YB-5O@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14672 http://gar.svn.sourceforge.net/gar/?rev=14672&view=rev Author: ellson Date: 2011-05-31 01:55:10 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: configure not finding working -lgd. Try changing dependency to CSWlibgd2 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 01:45:15 UTC (rev 14671) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 01:55:10 UTC (rev 14672) @@ -110,7 +110,7 @@ PACKAGES += CSWgraphvizgd SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 03:57:42 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 01:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14673] csw/mgar/pkg/gd/trunk/Makefile Message-ID: <E1QREDG-0002bn-3z@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14673 http://gar.svn.sourceforge.net/gar/?rev=14673&view=rev Author: ellson Date: 2011-05-31 01:57:41 +0000 (Tue, 31 May 2011) Log Message: ----------- gd: strip NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2011-05-31 01:55:10 UTC (rev 14672) +++ csw/mgar/pkg/gd/trunk/Makefile 2011-05-31 01:57:41 UTC (rev 14673) @@ -55,7 +55,6 @@ EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\" BUILD64 = 1 -NOISAEXEC = 1 STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 05:18:18 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 03:18:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14674] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRFTG-0003JP-KO@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 14674 http://gar.svn.sourceforge.net/gar/?rev=14674&view=rev Author: ellson Date: 2011-05-31 03:18:18 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: put back CHECKPKG_OVERRIDES I can explain and live with for now Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 01:57:41 UTC (rev 14673) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 03:18:18 UTC (rev 14674) @@ -40,7 +40,6 @@ # It only contains a link to CSWgraphviz. PACKAGES += CSWgraphviz2 SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package -RUNTIME_DEP_PKGS_CSWgraphviz2 = CSWgraphviz PKGFILES_CSWgraphviz2 = $(prefix)/graphviz2 ARCHALL_CSWgraphviz2 = 1 @@ -110,7 +109,8 @@ PACKAGES += CSWgraphvizgd SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 +# FIXME - graphviz seems to be using internal copy of libgd +#RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm @@ -154,7 +154,6 @@ RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4 PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.* @@ -163,13 +162,11 @@ PACKAGES += CSWgraphvizguile SPKG_DESC_CSWgraphvizguile = Graphviz language binding for guile -RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWguile -RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWexpat RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWzlib RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4 PKGFILES_CSWgraphvizguile = $(libdir)/graphviz/guile/.* @@ -223,7 +220,6 @@ RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4 PKGFILES_CSWgraphvizperl = $(libdir)/graphviz/perl/.* @@ -251,7 +247,6 @@ RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4 @@ -287,8 +282,7 @@ PACKAGES += CSWgraphviztcl SPKG_DESC_CSWgraphviztcl = Graphviz language binding for tcl -RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtcl -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWtk +RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtk RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcairo RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWfconfig RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpango @@ -301,7 +295,6 @@ RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgraphviz RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcdt5 RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4 @@ -408,9 +401,7 @@ CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += "PANGOCAIRO_CFLAGS=`pkg-config --cflags pangocairo`" - EXTRA_LD_FLAGS = -lm - STRIP_LIBTOOL=1 TEST_SCRIPTS = @@ -424,6 +415,47 @@ # /usr/local references from the docs are allright CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content +# these dependencies are all provided by this set of packages ! +CHECKPKG_OVERRIDES_CSWlibgvc6 += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so +CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so +CHECKPKG_OVERRIDES_CSWlibgvpr2 += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 +CHECKPKG_OVERRIDES_CSWlibgraph5 += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 +CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so +CHECKPKG_OVERRIDES_CSWlibcgraph6 += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 + +#FIXME - sometime - demo code +CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv +CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl + +#FIXME - sometime - non-critical feature for now +CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 +CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static + include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 06:19:58 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 04:19:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14675] csw/mgar/pkg/gd/trunk Message-ID: <E1QRGQw-0005dk-62@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14675 http://gar.svn.sourceforge.net/gar/?rev=14675&view=rev Author: ellson Date: 2011-05-31 04:19:57 +0000 (Tue, 31 May 2011) Log Message: ----------- gd: update to gd-2.0.36RC1 (latest, or perhaps last available release of gd) Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2011-05-31 03:18:18 UTC (rev 14674) +++ csw/mgar/pkg/gd/trunk/Makefile 2011-05-31 04:19:57 UTC (rev 14675) @@ -1,5 +1,5 @@ NAME = gd -VERSION = 2.0.35 +VERSION = 2.0.36RC1 CATEGORIES = lib DESCRIPTION = A library used for dynamic image creation @@ -13,8 +13,14 @@ endef MASTER_SITES = http://www.libgd.org/releases/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# Master site down. This version archived at: http://www.graphviz.org/pub/tmp/gd-2.0.36RC1.tar.gz +# Contact: ellson at opencsw.org +DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += gdkanji.c.patch + +#GARCOMPILER = GCC4 + PACKAGES = CSWgd CATALOGNAME_CSWgd = gd SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation @@ -47,7 +53,7 @@ PKGFILES_CSWlibgd-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype @@ -88,8 +94,8 @@ # The shipped libtool doesn't know about Sun Studio C++ compiler 'CC' pre-configure-modulated: - grm -f $(WORKSRC)/config/ltmain.sh - gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh - cd $(WORKSRC) && aclocal && automake +# grm -f $(WORKSRC)/config/ltmain.sh +# gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh +# cd $(WORKSRC) && aclocal && automake @$(MAKECOOKIE) Modified: csw/mgar/pkg/gd/trunk/checksums =================================================================== --- csw/mgar/pkg/gd/trunk/checksums 2011-05-31 03:18:18 UTC (rev 14674) +++ csw/mgar/pkg/gd/trunk/checksums 2011-05-31 04:19:57 UTC (rev 14675) @@ -1,3 +1,2 @@ -88e69d03742a55f979e2822d97c525c1 download/Makefile.diff -c9a4f9ee0fdef233a2ab0f5394672f2c download/fixme.sh -6c6c3dbb7bf079e0bb5fbbfd3bb8a71c download/gd-2.0.35.tar.bz2 +1eb8ddb8d9fc77f7502bb6cbcd706c08 gdkanji.c.patch +39ac48e6d5e0012a3bd2248a0102f209 gd-2.0.36RC1.tar.gz Added: csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch =================================================================== --- csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch (rev 0) +++ csw/mgar/pkg/gd/trunk/files/gdkanji.c.patch 2011-05-31 04:19:57 UTC (rev 14675) @@ -0,0 +1,11 @@ +--- gd-2.0.36RC1/gdkanji.c.orig 2011-05-31 06:03:47.966209006 +0200 ++++ gd-2.0.36RC1/gdkanji.c 2011-05-31 06:04:22.097778848 +0200 +@@ -25,7 +25,7 @@ + #endif + + #ifndef HAVE_ICONV +-#define ICONV_CONST /**/ ++#define ICONV_CONST const + iconv_t iconv_open (const char *, const char *); + size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *); + int iconv_close (iconv_t); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Tue May 31 06:23:18 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 00:23:18 -0400 Subject: [csw-devel] graphviz: what does "pkginfo-opencsw-repository-uncommitted" mean? In-Reply-To: <4DE439E4.7050008@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> <4DE439E4.7050008@opencsw.org> Message-ID: <4DE46D36.7010604@opencsw.org> These are the remaining errors (at least, the remaining errors that I don't understand). What do they mean? Are they safe to override. John CHECKPKG_OVERRIDES_CSWlibcdt5 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizgraphs += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphviz += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizsharp += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizpython += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizgd += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizdoc += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibgvpr2 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibcgraph6 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibgraph5 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizdevel += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibxdot4 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizguile += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibgvc6 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphvizperl += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWlibpathplan4 += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphviztcl += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWgraphviz2 += pkginfo-opencsw-repository-uncommitted From maciej at opencsw.org Tue May 31 08:45:22 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 07:45:22 +0100 Subject: [csw-devel] graphviz: what does "pkginfo-opencsw-repository-uncommitted" mean? In-Reply-To: <4DE46D36.7010604@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> <4DE439E4.7050008@opencsw.org> <4DE46D36.7010604@opencsw.org> Message-ID: <BANLkTi=zGM3NojrzDcRpoCn_qO+FHDB2gQ@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > These are the remaining errors (at least, the remaining errors that I > don't understand). > > What do they mean? ? Are they safe to override. No need to override, they will go away after you commit all the code changes to the repository. One more thing: when you look at checkpkg output, don't only look at the overrides at the end. Do look at explanations above, they may contain revelatory details. Maciej From maciej at opencsw.org Tue May 31 08:48:08 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 07:48:08 +0100 Subject: [csw-devel] SF.net SVN: gar:[14672] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <E1QREAp-0002YB-5O@sfp-svn-1.v30.ch3.sourceforge.com> References: <E1QREAp-0002YB-5O@sfp-svn-1.v30.ch3.sourceforge.com> Message-ID: <BANLkTik7gpPMwjuKMK_YLRvFu-TRZq1zGA@mail.gmail.com> 2011/5/31 <ellson at users.sourceforge.net>: > Revision: 14672 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=14672&view=rev > Author: ? ellson > Date: ? ? 2011-05-31 01:55:10 +0000 (Tue, 31 May 2011) > > Log Message: > ----------- > graphviz: configure not finding working -lgd. ?Try changing dependency to CSWlibgd2 > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/graphviz/trunk/Makefile > > Modified: csw/mgar/pkg/graphviz/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-31 01:45:15 UTC (rev 14671) > +++ csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-05-31 01:55:10 UTC (rev 14672) > @@ -110,7 +110,7 @@ > > ?PACKAGES += CSWgraphvizgd > ?SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd > -RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWgd > +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 > ?RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg > ?RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2 > ?RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm Hi John, This change will only alter the dependency declaration in the resulting package, it won't have any influence at what ./configure does. Maciej From ellson at users.sourceforge.net Tue May 31 09:42:57 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 07:42:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14676] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRJbN-0002xC-T6@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14676 http://gar.svn.sourceforge.net/gar/?rev=14676&view=rev Author: ellson Date: 2011-05-31 07:42:57 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: yet more dependencies poping up - suspect a working libgd2 actually exists on i386 platforms Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 04:19:57 UTC (rev 14675) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 07:42:57 UTC (rev 14676) @@ -110,7 +110,7 @@ PACKAGES += CSWgraphvizgd SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd # FIXME - graphviz seems to be using internal copy of libgd -#RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 +RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm @@ -148,8 +148,7 @@ PACKAGES += CSWgraphvizsharp SPKG_DESC_CSWgraphvizsharp = Graphviz language binding for C# -RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWmono -RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWexpat +RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWexpat RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWzlib RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4g++rt @@ -292,6 +291,11 @@ RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWglib2 RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWexpat RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWzlib +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpng +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWjpeg +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgd2 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWiconv +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWxpm RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibltdl7 @@ -409,9 +413,6 @@ # It's a known problem with the tcl library. CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content -# checkpkg can't detect a dependency on CSWmono -CHECKPKG_OVERRIDES_CSWgraphvizsharp += surplus-dependency|CSWmono - # /usr/local references from the docs are allright CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue May 31 09:48:57 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 08:48:57 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE439E4.7050008@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> <4DE439E4.7050008@opencsw.org> Message-ID: <BANLkTinB0h=htyN1CJGaNw2zsVA4c55f5w@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > On 05/30/2011 08:03 PM, Maciej Blizi?ski wrote: >> In the meantime, I've submitted the a change to the graphviz build recipe: >> >> - Removed the "ENABLE_CHECK = 0" line >> - Removed most of the overrides >> - Split off shared libraries to own packages (used the code generated >> by checkpkg) >> - Adjusted a number of dependencies (both missing and surplus) > > Thanks. OK, but won't this "splitting off shared libraries" also need to > be done to graphviz-2.26.3 if the goal is to retain the older libs for > use by ImageMagic? Yes, to provide the older libraries, they need to be repackaged as well. The split off done in the current version of graphviz is for the sake of future programs that might link to them. > Re: > ? ? ? ?CHECKPKG_OVERRIDES_CSWgraphviztcl += > soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so > ? ?... and 29 similar soname-not-found messgaes > > If I add these overrides for soname-not found (not found because the > soname is in the new ?packages) ?will that actually suppress future > checks, or do the check messages still occur but the package is allowed > to proceed? If you override these errors, your packages will be let through, at both the preliminary stage, and into the catalog. > In this case, I really want to say that these sonames are provided, so > don't bug me! ? (Thats probably why I had ENABLE_CHECK=0) ? Of course, > it would be better if checkpkg actually noticed by itself that they were > being provided. True. If these libraries are provided, but checkpkg thinks that they're not, then you've found a bug. Maciej From wahwah at users.sourceforge.net Tue May 31 09:50:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 31 May 2011 07:50:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14677] csw/mgar/gar/v2/lib/python/README Message-ID: <E1QRJiM-00050s-O9@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14677 http://gar.svn.sourceforge.net/gar/?rev=14677&view=rev Author: wahwah Date: 2011-05-31 07:50:10 +0000 (Tue, 31 May 2011) Log Message: ----------- checkpkg: a README update Overridden status is now stored in the database. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-05-31 07:42:57 UTC (rev 14676) +++ csw/mgar/gar/v2/lib/python/README 2011-05-31 07:50:10 UTC (rev 14677) @@ -31,7 +31,6 @@ - Add MySQL database garbage collection - Currently, the database is growing indefinitely, at the time of writing it's 1.5GB uncompressed. - - Add support for the 'overridden' field in the database - When adding a package to a catalog, store the time and date of the addition - Can be generalized as logging @@ -61,6 +60,7 @@ error_mgr. It's possible to need one of the listed files only, so files are given as alternatives, but the reason is common. - Notify maintainers when their package is available from mirrors +- Add support for the 'overridden' field in the database Known problems: - libmagic fails sometimes when processing the whole catalog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 31 09:52:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 31 May 2011 07:52:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14678] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: <E1QRJke-0000dl-QM@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14678 http://gar.svn.sourceforge.net/gar/?rev=14678&view=rev Author: wahwah Date: 2011-05-31 07:52:32 +0000 (Tue, 31 May 2011) Log Message: ----------- pkgdb: Don't display the backtrace Don't display the backtrace when database problems occur. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-05-31 07:50:10 UTC (rev 14677) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-05-31 07:52:32 UTC (rev 14678) @@ -451,7 +451,12 @@ "Importing %s, %s", stats["basic_stats"]["md5_sum"], stats["basic_stats"]["pkg_basename"]) - package_stats.PackageStats.ImportPkg(stats, options.replace) + try: + package_stats.PackageStats.ImportPkg(stats, options.replace) + except sqlobject.dberrors.OperationalError, e: + logging.fatal( + "A problem when importing package data has occurred: %s", e) + sys.exit(1) elif command == 'removepkg': for md5_sum in md5_sums: srv4 = GetPkg(md5_sum) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Tue May 31 10:19:24 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 04:19:24 -0400 Subject: [csw-devel] graphviz: what does "pkginfo-opencsw-repository-uncommitted" mean? In-Reply-To: <BANLkTi=zGM3NojrzDcRpoCn_qO+FHDB2gQ@mail.gmail.com> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> <4DE439E4.7050008@opencsw.org> <4DE46D36.7010604@opencsw.org> <BANLkTi=zGM3NojrzDcRpoCn_qO+FHDB2gQ@mail.gmail.com> Message-ID: <4DE4A48C.5070005@opencsw.org> Good morning, Maciej. Couldn't a check for uncommitted files be done at the beginning of the build process? Its and awful waste of a developer's time, and machine cycles, to go through an entire build only to discover that you'd left a stderr log or somesuch in the subversion checkout tree. John On 05/31/2011 02:45 AM, Maciej Blizi?ski wrote: > 2011/5/31 John Ellson <ellson at opencsw.org>: >> These are the remaining errors (at least, the remaining errors that I >> don't understand). >> >> What do they mean? Are they safe to override. > No need to override, they will go away after you commit all the code > changes to the repository. > > One more thing: when you look at checkpkg output, don't only look at > the overrides at the end. Do look at explanations above, they may > contain revelatory details. > > Maciej > From bonivart at users.sourceforge.net Tue May 31 10:19:56 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 31 May 2011 08:19:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14679] csw/mgar/pkg/phpMyAdmin/trunk Message-ID: <E1QRKBA-000182-JO@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 14679 http://gar.svn.sourceforge.net/gar/?rev=14679&view=rev Author: bonivart Date: 2011-05-31 08:19:56 +0000 (Tue, 31 May 2011) Log Message: ----------- phpMyAdmin/trunk: update to 3.4.1 Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/checksums Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2011-05-31 07:52:32 UTC (rev 14678) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2011-05-31 08:19:56 UTC (rev 14679) @@ -1,5 +1,5 @@ NAME = phpMyAdmin -VERSION = 3.2.2 +VERSION = 3.4.1 CATEGORIES = apps DESCRIPTION = Effective MySQL Management @@ -21,9 +21,6 @@ RUNTIME_DEP_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt RUNTIME_DEP_PKGS += CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-all-languages.tar.bz2 - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -32,6 +29,22 @@ ARCHALL = 1 SPKG_SOURCEURL = http://www.phpmyadmin.net +CHECKPKG_OVERRIDES_CSWphpmyadmin += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5session +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5zip +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5gd +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5mbstring +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5mcrypt +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWap2modphp5 +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWmysql5 +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5ctype +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5mysqli +CHECKPKG_OVERRIDES_CSWphpmyadmin += file-with-bad-content|/usr/share|root/opt/csw/share/www/phpmyadmin/libraries/vendor_config.php +CHECKPKG_OVERRIDES_CSWphpmyadmin += file-with-bad-content|/usr/share|root/opt/csw/share/www/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Font.php +CHECKPKG_OVERRIDES_CSWphpmyadmin += file-with-bad-content|/usr/local|root/opt/csw/share/www/phpmyadmin/libraries/transformations/text_plain__external.inc.php + include gar/category.mk install-custom: Modified: csw/mgar/pkg/phpMyAdmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/checksums 2011-05-31 07:52:32 UTC (rev 14678) +++ csw/mgar/pkg/phpMyAdmin/trunk/checksums 2011-05-31 08:19:56 UTC (rev 14679) @@ -1,2 +1 @@ -a5f6492f89ee1ff17b76593af79640ce download/phpMyAdmin-3.2.2-all-languages.tar.bz2 -25157d38d820705d47f2056d67cc0c2e download/CSWphpmyadmin.gspec +6885d9b2f4e20574e6de2511732a8659 phpMyAdmin-3.4.1-all-languages.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Tue May 31 10:23:54 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 31 May 2011 10:23:54 +0200 Subject: [csw-devel] graphviz: what does "pkginfo-opencsw-repository-uncommitted" mean? In-Reply-To: <4DE4A48C.5070005@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> <BANLkTinb3gJ2K9uF3X57LHaveW-7dxqhtQ@mail.gmail.com> <4DE439E4.7050008@opencsw.org> <4DE46D36.7010604@opencsw.org> <BANLkTi=zGM3NojrzDcRpoCn_qO+FHDB2gQ@mail.gmail.com> <4DE4A48C.5070005@opencsw.org> Message-ID: <BANLkTiny+BtLhcbdmfdVHDD3iBwtCMWoNQ@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > Good morning, Maciej. > > Couldn't a check for uncommitted files be done at the beginning of the > build process? Checkpkg is only run at the end. > Its and awful waste of a developer's time, and machine cycles, to go > through an entire build only to discover that you'd left a stderr log or > somesuch in the subversion checkout tree. There's no need to redo the whole build, you only have to do "remerge repackage", even for a large package that shouldn't take more than a few minutes at the most. /peter From maciej at opencsw.org Tue May 31 12:48:16 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 11:48:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE42A7D.5080705@opencsw.org> References: <E1QR3rX-0000PB-67@sfp-svn-3.v30.ch3.sourceforge.com> <BANLkTikvw7V0oXtBv2tbbvfNuDFzFaDshg@mail.gmail.com> <4DE3E870.6070005@opencsw.org> <BANLkTimWG1_ygyCF-9DUqi01Q2MPX_+=ug@mail.gmail.com> <4DE40775.9060303@opencsw.org> <BANLkTin_wWHD-6z0jo5L1T4Oo-y_Q2E9pg@mail.gmail.com> <4DE42A7D.5080705@opencsw.org> Message-ID: <BANLkTi=LogKa-9ypHswsCGt3=drN4CnhuA@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > I've attached the ldd output from the old release, if that's helpful? I would suggest looking at the new binaries, not the old ones. Try running ldd against your new binaries, and examining the output. Maciej From ellson at users.sourceforge.net Tue May 31 13:58:08 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 11:58:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14680] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRNaK-0001ep-5E@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14680 http://gar.svn.sourceforge.net/gar/?rev=14680&view=rev Author: ellson Date: 2011-05-31 11:58:07 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: seems some lib dependencies are both missing and surplus Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 08:19:56 UTC (rev 14679) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 11:58:07 UTC (rev 14680) @@ -457,6 +457,15 @@ CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static +# Seems I have to both add the dependencies and mark them as surplus! +# Something wrong with lingd2, I think. +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWxpm +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWiconv +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWlibgd2 +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWjpeg +CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWpng +CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWlibgd2 + include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 14:08:06 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 12:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14681] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QRNjy-0001qr-S3@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14681 http://gar.svn.sourceforge.net/gar/?rev=14681&view=rev Author: ellson Date: 2011-05-31 12:08:06 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: try to fix detection of libgd Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 11:58:07 UTC (rev 14680) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 12:08:06 UTC (rev 14681) @@ -21,6 +21,7 @@ GARCOMPILER = GCC4 PATCHFILES += configure.patch +PATCHFILES += configure_gd.patch PATCHFILES += Makefile.am.patch PATCHFILES += trapezoid.c.patch PATCHFILES += post_process.c.patch Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-31 11:58:07 UTC (rev 14680) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-31 12:08:06 UTC (rev 14681) @@ -4,6 +4,7 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall bb58d5086e1aaa2519a7184b9ef1748f configure.patch +601adb487b4698e0a955206a2190725b configure_gd.patch 85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch Added: csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch 2011-05-31 12:08:06 UTC (rev 14681) @@ -0,0 +1,21 @@ +--- graphviz-2.28.0/configure.old 2011-05-31 13:58:42.522392950 +0200 ++++ graphviz-2.28.0/configure 2011-05-31 14:02:05.736756763 +0200 +@@ -25270,7 +25270,8 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgd $GD_LIBS $LIBS" ++GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" ++LIBS="$GD_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25296,8 +25297,6 @@ + $as_echo "$ac_cv_lib_gd_main" >&6; } + if test "x$ac_cv_lib_gd_main" = x""yes; then : + +- GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" +- + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBGD 1 + _ACEOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue May 31 14:22:52 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 12:22:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14682] csw/mgar/pkg/graphviz/trunk Message-ID: <E1QRNyG-00026R-Lv@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14682 http://gar.svn.sourceforge.net/gar/?rev=14682&view=rev Author: ellson Date: 2011-05-31 12:22:52 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: get rid of -x switch that gcc doesn't like Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums csw/mgar/pkg/graphviz/trunk/files/configure.patch Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 12:08:06 UTC (rev 14681) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 12:22:52 UTC (rev 14682) @@ -21,7 +21,6 @@ GARCOMPILER = GCC4 PATCHFILES += configure.patch -PATCHFILES += configure_gd.patch PATCHFILES += Makefile.am.patch PATCHFILES += trapezoid.c.patch PATCHFILES += post_process.c.patch Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-05-31 12:08:06 UTC (rev 14681) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-05-31 12:22:52 UTC (rev 14682) @@ -3,8 +3,7 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postuninstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall -bb58d5086e1aaa2519a7184b9ef1748f configure.patch -601adb487b4698e0a955206a2190725b configure_gd.patch +d039829d638e26ea600f4db3e213959f configure.patch 85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch Modified: csw/mgar/pkg/graphviz/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/configure.patch 2011-05-31 12:08:06 UTC (rev 14681) +++ csw/mgar/pkg/graphviz/trunk/files/configure.patch 2011-05-31 12:22:52 UTC (rev 14682) @@ -1,6 +1,6 @@ ---- graphviz-2.24.0/configure.orig 2009-06-17 01:24:55.000000000 +0200 -+++ graphviz-2.24.0/configure 2010-01-28 02:57:28.658585976 +0100 -@@ -3425,7 +3425,7 @@ +--- graphviz-2.28.0/configure.orig 2011-05-07 05:27:36.000000000 +0200 ++++ graphviz-2.28.0/configure 2011-05-31 14:13:54.695706826 +0200 +@@ -4056,7 +4056,7 @@ if test "x${prefix}" != "x/usr"; then CPPFLAGS="$CPPFLAGS -I${prefix}/include" LDFLAGS="$LDFLAGS -L${prefix}/lib" @@ -9,3 +9,31 @@ export PKG_CONFIG_PATH fi +@@ -25115,7 +25115,7 @@ + + if test -n "$GDLIB_CONFIG"; then + GD_INCLUDES=`$GDLIB_CONFIG --includes` +- GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=386 //'` ++ GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=[^ ]* //'` + GD_LIBS=`$GDLIB_CONFIG --libs` + GD_MAJORVERSION=`$GDLIB_CONFIG --majorversion` + GD_MINORVERSION=`$GDLIB_CONFIG --minorversion` +@@ -25270,7 +25270,8 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgd $GD_LIBS $LIBS" ++GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" ++LIBS="$GD_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25296,8 +25297,6 @@ + $as_echo "$ac_cv_lib_gd_main" >&6; } + if test "x$ac_cv_lib_gd_main" = x""yes; then : + +- GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" +- + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBGD 1 + _ACEOF Deleted: csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch 2011-05-31 12:08:06 UTC (rev 14681) +++ csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch 2011-05-31 12:22:52 UTC (rev 14682) @@ -1,21 +0,0 @@ ---- graphviz-2.28.0/configure.old 2011-05-31 13:58:42.522392950 +0200 -+++ graphviz-2.28.0/configure 2011-05-31 14:02:05.736756763 +0200 -@@ -25270,7 +25270,8 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lgd $GD_LIBS $LIBS" -+GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" -+LIBS="$GD_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -25296,8 +25297,6 @@ - $as_echo "$ac_cv_lib_gd_main" >&6; } - if test "x$ac_cv_lib_gd_main" = x""yes; then : - -- GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" -- - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBGD 1 - _ACEOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Tue May 31 15:10:11 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 09:10:11 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* Message-ID: <4DE4E8B3.7070404@opencsw.org> I have a minor update for gd. I'm getting the following errors: ellson at login:~> csw-upload-pkg newpkgs/gd-2.0.36RC1/* ... Checking 3 package(s) against catalog unstable sparc SunOS5.9 ERROR: --catalog-release does not exist Checking 3 package(s) against catalog unstable i386 SunOS5.9 ERROR: --catalog-release does not exist Checking 3 package(s) against catalog unstable sparc SunOS5.10 ERROR: --catalog-release does not exist Checking 3 package(s) against catalog unstable i386 SunOS5.10 ERROR: --catalog-release does not exist Checks failed for catalogs: ... Packages have not been submitted to the unstable catalog. Is this something I'm doing wrong? John From ellson at users.sourceforge.net Tue May 31 15:29:19 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 31 May 2011 13:29:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14683] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: <E1QRP0Z-0004Z0-So@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 14683 http://gar.svn.sourceforge.net/gar/?rev=14683&view=rev Author: ellson Date: 2011-05-31 13:29:19 +0000 (Tue, 31 May 2011) Log Message: ----------- graphviz: now libgd2 is found properly the surplus-dependency overrides can be removed Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 12:22:52 UTC (rev 14682) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-05-31 13:29:19 UTC (rev 14683) @@ -457,15 +457,6 @@ CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static -# Seems I have to both add the dependencies and mark them as surplus! -# Something wrong with lingd2, I think. -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWxpm -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWiconv -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWlibgd2 -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWjpeg -CHECKPKG_OVERRIDES_CSWgraphviztcl += surplus-dependency|CSWpng -CHECKPKG_OVERRIDES_CSWgraphvizgd += surplus-dependency|CSWlibgd2 - include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Tue May 31 15:49:56 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 09:49:56 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE4E8B3.7070404@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> Message-ID: <4DE4F204.1020206@opencsw.org> I know there were problems with csw-upload-pkg yesterday, so I'm probably being premature? Getting the same kind of errors for graphviz: ellson at login:~> csw-upload-pkg newpkgs/graphviz-2.28.0/* ... Checking 18 package(s) against catalog unstable sparc SunOS5.9 ERROR: --catalog-release does not exist Checking 18 package(s) against catalog unstable i386 SunOS5.9 ERROR: --catalog-release does not exist Checking 18 package(s) against catalog unstable sparc SunOS5.10 ERROR: --catalog-release does not exist Checking 18 package(s) against catalog unstable i386 SunOS5.10 ERROR: --catalog-release does not exist Checks failed for catalogs: ... Packages have not been submitted to the unstable catalog. John On 05/31/2011 09:10 AM, John Ellson wrote: > I have a minor update for gd. I'm getting the following errors: > > ellson at login:~> csw-upload-pkg newpkgs/gd-2.0.36RC1/* > ... > Checking 3 package(s) against catalog unstable sparc SunOS5.9 > ERROR: --catalog-release does not exist > Checking 3 package(s) against catalog unstable i386 SunOS5.9 > ERROR: --catalog-release does not exist > Checking 3 package(s) against catalog unstable sparc SunOS5.10 > ERROR: --catalog-release does not exist > Checking 3 package(s) against catalog unstable i386 SunOS5.10 > ERROR: --catalog-release does not exist > Checks failed for catalogs: > ... > Packages have not been submitted to the unstable catalog. > > > Is this something I'm doing wrong? > > John From maciej at opencsw.org Tue May 31 18:14:59 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 17:14:59 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE4F204.1020206@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> Message-ID: <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> If you try the version from gar sources, it will work. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.opencsw.org/pipermail/devel/attachments/20110531/3e6ecd03/attachment.html> From ellson at opencsw.org Tue May 31 18:43:10 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 12:43:10 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> Message-ID: <4DE51A9E.8060804@opencsw.org> On 05/31/2011 12:14 PM, Maciej Blizi?ski wrote: > > If you try the version from gar sources, it will work. > > OK, that went well. gd-2.0.36RC1 and graphviz-2.28.0 uploaded to unstable. I was able to access test9s, so can you give me some more instructions on how to use the test system? Do I need to request installation of graphviz on test9s, or am I able to do it myself? (The new gd package built cleanly, but it isn't needed for graphviz testing.) John From maciej at opencsw.org Tue May 31 19:30:41 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 18:30:41 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE51A9E.8060804@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> Message-ID: <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> [+buildfarm] On Tue, May 31, 2011 at 5:43 PM, John Ellson <ellson at opencsw.org> wrote: > On 05/31/2011 12:14 PM, Maciej Blizi?ski wrote: >> >> If you try the version from gar sources, it will work. >> >> > > OK, that went well. > > gd-2.0.36RC1 and graphviz-2.28.0 uploaded to unstable. > > I was able to access test9s, ?so can you give me some more instructions > on how to use the test system? > Do I need to request installation of graphviz on test9s, or am I able to > do it myself? Both could work I guess. You can request the installation, or get sudo access on the test machines, and install the package yourself. Maciej From jake_goerzen at users.sourceforge.net Tue May 31 19:46:10 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 31 May 2011 17:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14684] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: <E1QRT18-0003zf-6H@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 14684 http://gar.svn.sourceforge.net/gar/?rev=14684&view=rev Author: jake_goerzen Date: 2011-05-31 17:46:09 +0000 (Tue, 31 May 2011) Log Message: ----------- dovecot: update dependencies Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-05-31 13:29:19 UTC (rev 14683) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-05-31 17:46:09 UTC (rev 14684) @@ -34,8 +34,8 @@ SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin RUNTIME_DEP_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq -RUNTIME_DEP_PKGS_CSWdovecot += CSWsasl CSWsqlite3rt CSWzlib CSWlibnet -RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils +RUNTIME_DEP_PKGS_CSWdovecot += CSWzlib CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv RUNTIME_DEP_PKGS_CSWdovecot += CSWkrb5lib RUNTIME_DEP_PKGS_CSWdovecot-devel = CSWdovecot RUNTIME_DEP_PKGS_CSWdovecot-sieve = CSWdovecot @@ -43,8 +43,6 @@ BUILD_DEP_PKGS = CSWossldevel CSWosslrt BUILD_DEP_PKGS += CSWmysql5devel CSWmysql5rt BUILD_DEP_PKGS += CSWoldaprt CSWoldapdevel -BUILD_DEP_PKGS += CSWsasl -BUILD_DEP_PKGS += CSWsqlite3 BUILD_DEP_PKGS += CSWlibpq BUILD_DEP_PKGS += CSWkrb5lib CSWkrb5libdev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Tue May 31 19:49:41 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 13:49:41 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> Message-ID: <4DE52A35.6000007@opencsw.org> On 05/31/2011 01:30 PM, Maciej Blizi?ski wrote: > [+buildfarm] > > On Tue, May 31, 2011 at 5:43 PM, John Ellson <ellson at opencsw.org> wrote: >> ... >> I was able to access test9s, so can you give me some more instructions >> on how to use the test system? >> Do I need to request installation of graphviz on test9s, or am I able to >> do it myself? > Both could work I guess. You can request the installation, or get > sudo access on the test machines, and install the package yourself. Would you please install the graphviz-2.28.0 packages? I'll defer playing root on your machines for now ;-) John From maciej at opencsw.org Tue May 31 20:46:53 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 19:46:53 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE52A35.6000007@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> <4DE52A35.6000007@opencsw.org> Message-ID: <BANLkTin7QZZUwJ2ipnuAHHEXpX34TzDc0Q@mail.gmail.com> 2011/5/31 John Ellson <ellson at opencsw.org>: > On 05/31/2011 01:30 PM, Maciej Blizi?ski wrote: >> [+buildfarm] >> >> On Tue, May 31, 2011 at 5:43 PM, John Ellson <ellson at opencsw.org> wrote: >>> > ... >>> I was able to access test9s, ?so can you give me some more instructions >>> on how to use the test system? >>> Do I need to request installation of graphviz on test9s, or am I able to >>> do it myself? >> Both could work I guess. ?You can request the installation, or get >> sudo access on the test machines, and install the package yourself. > > Would you please install the graphviz-2.28.0 packages? I can do that, could you put them in the experimental catalog? (/home/experimental/ellson on the buildfarm) Maciej From ellson at opencsw.org Tue May 31 21:37:14 2011 From: ellson at opencsw.org (John Ellson) Date: Tue, 31 May 2011 15:37:14 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <BANLkTin7QZZUwJ2ipnuAHHEXpX34TzDc0Q@mail.gmail.com> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> <4DE52A35.6000007@opencsw.org> <BANLkTin7QZZUwJ2ipnuAHHEXpX34TzDc0Q@mail.gmail.com> Message-ID: <4DE5436A.3090008@opencsw.org> On 05/31/2011 02:46 PM, Maciej Blizi?ski wrote: > 2011/5/31 John Ellson <ellson at opencsw.org>: >> On 05/31/2011 01:30 PM, Maciej Blizi?ski wrote: >>> [+buildfarm] >>> >>> On Tue, May 31, 2011 at 5:43 PM, John Ellson <ellson at opencsw.org> wrote: >> ... >>>> I was able to access test9s, so can you give me some more instructions >>>> on how to use the test system? >>>> Do I need to request installation of graphviz on test9s, or am I able to >>>> do it myself? >>> Both could work I guess. You can request the installation, or get >>> sudo access on the test machines, and install the package yourself. >> Would you please install the graphviz-2.28.0 packages? > I can do that, could you put them in the experimental catalog? > (/home/experimental/ellson on the buildfarm) Done. John > Maciej > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From maciej at opencsw.org Tue May 31 22:36:28 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 21:36:28 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE5436A.3090008@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> <4DE52A35.6000007@opencsw.org> <BANLkTin7QZZUwJ2ipnuAHHEXpX34TzDc0Q@mail.gmail.com> <4DE5436A.3090008@opencsw.org> Message-ID: <BANLkTi=qkkBSHgO7Zmb1UYEn5hxnUWSvHA@mail.gmail.com> There seems to be a problem with the sudoers file, I've sent a request to buildfarm@ to fix that. Maciej From skayser at users.sourceforge.net Tue May 31 23:24:04 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 May 2011 21:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14685] csw/mgar/pkg Message-ID: <E1QRWQ0-0001ta-Up@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 14685 http://gar.svn.sourceforge.net/gar/?rev=14685&view=rev Author: skayser Date: 2011-05-31 21:24:04 +0000 (Tue, 31 May 2011) Log Message: ----------- zzuf/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/zzuf/ csw/mgar/pkg/zzuf/branches/ csw/mgar/pkg/zzuf/tags/ csw/mgar/pkg/zzuf/trunk/ csw/mgar/pkg/zzuf/trunk/Makefile csw/mgar/pkg/zzuf/trunk/checksums csw/mgar/pkg/zzuf/trunk/files/ Property changes on: csw/mgar/pkg/zzuf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar//v2 Added: csw/mgar/pkg/zzuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/zzuf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zzuf/trunk/Makefile 2011-05-31 21:24:04 UTC (rev 14685) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! doesn't build yet +# +# "libzzuf/lib-stream.c", line 284: warning: implicit function declaration: _zz_init +# ... +# "libzzuf/lib-stream.c", line 1044: warning: assignment type mismatch: +# pointer to function(pointer to struct __FILE {int _cnt, pointer to unsigned char _ptr, pointer to unsigned char _base, unsigned char _flag, unsigned char _file, unsigned int __orientation :2, unsigned int __ionolock :1, unsigned int __seekable :1, unsigned int __filler :4}) returning int "=" pointer to void +#cc: acomp failed for libzzuf/lib-stream.c +# gmake[4]: *** [libzzuf_la-lib-stream.lo] Error 1 +# + +NAME = zzuf +VERSION = 0.13 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Transparent application input fuzzer +define BLURB + zzuf is a transparent application input fuzzer. It works by intercepting + file operations and changing random bits in the program's input. zzuf's + behaviour is deterministic, making it easy to reproduce bugs. +endef + +VENDOR_URL = http://caca.zoy.org/wiki/zzuf +MASTER_SITES = http://caca.zoy.org/files/zzuf/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/zzuf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/zzuf/trunk/checksums =================================================================== --- csw/mgar/pkg/zzuf/trunk/checksums (rev 0) +++ csw/mgar/pkg/zzuf/trunk/checksums 2011-05-31 21:24:04 UTC (rev 14685) @@ -0,0 +1 @@ +74579c429f9691f641a14f408997d42d zzuf-0.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue May 31 23:31:33 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 31 May 2011 22:31:33 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <BANLkTi=qkkBSHgO7Zmb1UYEn5hxnUWSvHA@mail.gmail.com> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <BANLkTi=JG+2ou-7Yuhj4a9Xe9QFioH+OMg@mail.gmail.com> <4DE51A9E.8060804@opencsw.org> <BANLkTinmmhawfgQVxsOiek52fw6t7_8Zsw@mail.gmail.com> <4DE52A35.6000007@opencsw.org> <BANLkTin7QZZUwJ2ipnuAHHEXpX34TzDc0Q@mail.gmail.com> <4DE5436A.3090008@opencsw.org> <BANLkTi=qkkBSHgO7Zmb1UYEn5hxnUWSvHA@mail.gmail.com> Message-ID: <BANLkTi=LL5GhyBrdeQmCbT74myxY8qF32Q@mail.gmail.com> In the meantime, I installed updated graphviz packages on a test instance. Here's the end of the terminal session: pkgutil -t http://buildfarm.opencsw.org/opencsw/experimental/ellson -y -i graphvizgd Installation of <CSWlibgraph5> was successful. => Installing CSWlibcgraph6-2.28.0,REV=2011.05.31 (4/10) ... Please see /opt/csw/share/doc/libcgraph6/license for license information. Installation of <CSWlibcgraph6> was successful. => Installing CSWlibgd2-2.0.36RC1,REV=2011.05.31 (5/10) ... Please see /opt/csw/share/doc/libgd2/license for license information. Installation of <CSWlibgd2> was successful. => Installing CSWlibcdt5-2.28.0,REV=2011.05.31 (6/10) ... Please see /opt/csw/share/doc/libcdt5/license for license information. Installation of <CSWlibcdt5> was successful. => Installing CSWlibgvpr2-2.28.0,REV=2011.05.31 (7/10) ... Please see /opt/csw/share/doc/libgvpr2/license for license information. Installation of <CSWlibgvpr2> was successful. => Installing CSWlibgvc6-2.28.0,REV=2011.05.31 (8/10) ... Please see /opt/csw/share/doc/libgvc6/license for license information. Installation of <CSWlibgvc6> was successful. => Installing CSWgraphviz-2.28.0,REV=2011.05.31 (9/10) ... Please see /opt/csw/share/doc/graphviz/license for license information. dot -c is running now to record available graphviz plugins. ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory Killed Installation of <CSWgraphviz> was successful. => Installing CSWgraphvizgd-2.28.0,REV=2011.05.31 (10/10) ... Please see /opt/csw/share/doc/graphvizgd/license for license information. dot -c is running now to record available graphviz plugins. ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory Killed Installation of <CSWgraphvizgd> was successful. vsol05 ~ # dot -h ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory Killed vsol05 ~ # ldd /opt/csw/bin/dot libgvc.so.6 => /opt/csw/lib/i386/libgvc.so.6 libxdot.so.4 => /opt/csw/lib/i386/libxdot.so.4 libgraph.so.5 => /opt/csw/lib/i386/libgraph.so.5 libcdt.so.5 => /opt/csw/lib/i386/libcdt.so.5 libpathplan.so.4 => /opt/csw/lib/i386/libpathplan.so.4 libexpat.so.1 => /opt/csw/lib/i386/libexpat.so.1 libsocket.so.1 => /lib/libsocket.so.1 libnsl.so.1 => /lib/libnsl.so.1 libz.so.1 => /opt/csw/lib/pentium_pro+mmx/libz.so.1 libm.so.1 => /lib/libm.so.1 libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 libdl.so.1 => /lib/libdl.so.1 libc.so.1 => /lib/libc.so.1 libgraph.so.4 => (file not found) libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 libcdt.so.4 => (file not found) libmp.so.2 => /lib/libmp.so.2 libmd.so.1 => /lib/libmd.so.1 libscf.so.1 => /lib/libscf.so.1 libdoor.so.1 => /lib/libdoor.so.1 libuutil.so.1 => /lib/libuutil.so.1 libgen.so.1 => /lib/libgen.so.1 libm.so.2 => /lib/libm.so.2 From theferret at users.sourceforge.net Tue May 31 23:42:42 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 31 May 2011 21:42:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14686] csw/mgar/pkg/alternatives/trunk/prototype Message-ID: <E1QRWi2-00041Y-D6@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14686 http://gar.svn.sourceforge.net/gar/?rev=14686&view=rev Author: theferret Date: 2011-05-31 21:42:42 +0000 (Tue, 31 May 2011) Log Message: ----------- alternatives: added more docs into package Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/prototype Modified: csw/mgar/pkg/alternatives/trunk/prototype =================================================================== --- csw/mgar/pkg/alternatives/trunk/prototype 2011-05-31 21:24:04 UTC (rev 14685) +++ csw/mgar/pkg/alternatives/trunk/prototype 2011-05-31 21:42:42 UTC (rev 14686) @@ -3,3 +3,6 @@ f none /usr/sadm/install/scripts/i.cswalternatives=i.cswalternatives 0755 root bin f none /usr/sadm/install/scripts/r.cswalternatives=r.cswalternatives 0755 root bin f none /opt/csw/sbin/alternatives=alternatives 0755 root bin +d none /opt/csw/share/doc/alternatives 0755 root bin +f none /opt/csw/share/doc/alternatives/README.user=README.user 0644 root bin +f none /opt/csw/share/doc/alternatives/README.code=README 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue May 31 23:43:19 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 31 May 2011 21:43:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14687] csw/mgar/pkg/alternatives/trunk Message-ID: <E1QRWid-00042Y-0j@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 14687 http://gar.svn.sourceforge.net/gar/?rev=14687&view=rev Author: theferret Date: 2011-05-31 21:43:18 +0000 (Tue, 31 May 2011) Log Message: ----------- alternatives: improved in-package docs, bumped rev Modified Paths: -------------- csw/mgar/pkg/alternatives/trunk/README csw/mgar/pkg/alternatives/trunk/pkginfo Modified: csw/mgar/pkg/alternatives/trunk/README =================================================================== --- csw/mgar/pkg/alternatives/trunk/README 2011-05-31 21:42:42 UTC (rev 14686) +++ csw/mgar/pkg/alternatives/trunk/README 2011-05-31 21:43:18 UTC (rev 14687) @@ -1,26 +1,66 @@ -A quickie readme for the future, about this "alternatives" implementation: +This file is more of an "internals" thoughts and notes file. +For user facing documentation, see README.user Phil decided that a from-scratch, CSW-custom implementation was needed, because the debian one was hugely bloated, and the redhat smaller one, did not play nicely with NFS-shared /opt/csw -So pleaes dont go getting ideas that we can migrated back to redhat,etc +So please dont go getting ideas that we can migrated back to redhat,etc in the future! :) we tried, and it failed. +Sections below: + * CODE NOTES + * FILE FORMATS + -Internal implementation notes: +CODE NOTES My initial version seems to expect each "alternative" to have its own -file in /opt/csw/share/alternatives/xyz. -One line per file only would be nice, please +file as /opt/csw/share/alternatives/xyz +One line per file only would be nice, please. But this suports +multiple lines per file now. When a choice is manually set (overriding auto settings), it records that -fact by making a symlink from the shipped file, to +fact by making a symlink from the relevant shipped file, to /etc/opt/csw/alternatives/(progname) +and then it will make the user-facing symlink(s) indicated by that file This way, you can have the binary, and alternatives files per software, -NFS-shared, but then have machine-local overrides. +in NFS-shared /opt/csw, but then have machine-local overrides. Reminder: Do NOT have to get fancy with the class action script not getting called with pathnames on sparse zones with pkg-inherit-dir, because since /opt/csw is shared, the symlink will already be in place. + Ambuguity for --remove: + what if --remove is used, on something that has a manually set pref? + (rather than calling --auto) + I choose that it will LEAVE the manual choice. + That is to say, it will leave the saved preference as valid. + BUT, if the manual choice matches the --remove", then + it should skip it as a "what to match" option..? !! + + This is to potentially make our pkgrm/pkgadd upgrade cycle + function as a user expects: to preserve their manual choice. + +FILE FORMATS + + Packages that provide implementation of an "alternative" for a + particular path, need to provide a file in + /opt/csw/share/alternatives/[softwarename] + + *** Note that it MUST be in that directory and nowhere else !!! *** + + The format of this file, is one or more lines, of the following format: + + /full/path shortname /provided/path priority [/slave/path shortname /provide! + + Note that tabs are not allowed. + + The purpose of the "slave path", is that sometimes, when the "main" path + changes its implementation, one or more other ones must be changed + to match. + + This line format, is normally passed onto our + "alternatives" binary by the class action script, directly as + an arg list to the --install option. + Modified: csw/mgar/pkg/alternatives/trunk/pkginfo =================================================================== --- csw/mgar/pkg/alternatives/trunk/pkginfo 2011-05-31 21:42:42 UTC (rev 14686) +++ csw/mgar/pkg/alternatives/trunk/pkginfo 2011-05-31 21:43:18 UTC (rev 14687) @@ -1,7 +1,7 @@ PKG=CSWalternatives ARCH=all NAME=alternatives - an implementation of linux-style alternatives choice mgr -VERSION=1.1,REV=YYYY.MM.DD +VERSION=1.1.1,REV=YYYY.MM.DD CATEGORY=system VENDOR=http://www.opencsw.org written and packaged for CSW by Philip Brown EMAIL=phil at opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon May 30 21:03:27 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 30 May 2011 19:03:27 -0000 Subject: [csw-devel] Fwd: Re: SF.net SVN: gar:[14667] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE3E926.4020703@opencsw.org> References: <4DE3E926.4020703@opencsw.org> Message-ID: <BANLkTi=gGFot1HUomQ33zEgt0Q94y+bG+Q@mail.gmail.com> Maybe you're not subscribed to the development list. Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.opencsw.org/pipermail/devel/attachments/20110530/7be9f39f/attachment-0001.html>